From 3092121a7a05fd89ac2b3b00f28f07f2026c470a Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Fri, 19 Jun 2015 11:42:07 +0800 Subject: [PATCH] =?UTF-8?q?bug#2878:=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7?= =?UTF-8?q?=EF=BC=9A=E7=BC=96=E8=BE=91=E5=B8=96=E5=AD=90=E3=80=81=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=9B=9E=E5=B8=96=E7=9A=84=E6=97=B6=E5=80=99=E5=BB=BA?= =?UTF-8?q?=E8=AE=AE=E4=B8=8D=E8=A6=81=E6=98=BE=E7=A4=BA=E4=B8=BB=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/memos_controller.rb | 2 +- app/views/memos/edit.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb index 54bcc0496..68f6f6473 100644 --- a/app/controllers/memos_controller.rb +++ b/app/controllers/memos_controller.rb @@ -157,7 +157,7 @@ class MemosController < ApplicationController def update respond_to do |format| - if( @memo.update_column(:subject, params[:memo][:subject]) && + if( #@memo.update_column(:subject, params[:memo][:subject]) && @memo.update_column(:content, params[:memo][:content]) && @memo.update_column(:sticky, params[:memo][:sticky]) && @memo.update_column(:lock, params[:memo][:lock])) diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb index b7aa08abd..6328edcac 100644 --- a/app/views/memos/edit.html.erb +++ b/app/views/memos/edit.html.erb @@ -21,9 +21,9 @@

<% if @memo.parent.nil? && @memo.children.first.nil? %> - <%= f.text_field :subject, :required => true, :size => 96 ,:readonly => false, :maxlength => 50%> + <%#= f.text_field :subject, :required => true, :size => 96 ,:readonly => false, :maxlength => 50%> <% else %> - <%= f.text_field :subject, :required => true, :size => 96 ,:readonly => true, :style => "border: 1px solid gray", :maxlength => 50%> + <%#= f.text_field :subject, :required => true, :size => 96 ,:readonly => true, :style => "border: 1px solid gray", :maxlength => 50%> <% end %>

<% if User.current.admin?%>