|
|
@ -73,6 +73,7 @@ class MemosController < ApplicationController
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
#end
|
|
|
|
#end
|
|
|
|
|
|
|
|
format.js
|
|
|
|
format.html { redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}" }
|
|
|
|
format.html { redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}" }
|
|
|
|
format.json { render json: @memo, status: :created, location: @memo }
|
|
|
|
format.json { render json: @memo, status: :created, location: @memo }
|
|
|
|
else
|
|
|
|
else
|
|
|
@ -152,6 +153,7 @@ class MemosController < ApplicationController
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def update
|
|
|
|
def update
|
|
|
|
|
|
|
|
@flag = false
|
|
|
|
respond_to do |format|
|
|
|
|
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(:content, params[:memo][:content]) &&
|
|
|
@ -159,10 +161,12 @@ class MemosController < ApplicationController
|
|
|
|
@memo.update_column(:lock, params[:memo][:lock]) &&
|
|
|
|
@memo.update_column(:lock, params[:memo][:lock]) &&
|
|
|
|
@memo.update_column(:subject,params[:memo][:subject]))
|
|
|
|
@memo.update_column(:subject,params[:memo][:subject]))
|
|
|
|
@memo.save_attachments(params[:attachments] || (params[:memo] && params[:memo][:uploads]))
|
|
|
|
@memo.save_attachments(params[:attachments] || (params[:memo] && params[:memo][:uploads]))
|
|
|
|
@memo.save
|
|
|
|
@flag = @memo.save
|
|
|
|
# @memo.root.update_attribute(:updated_at, @memo.updated_at)
|
|
|
|
# @memo.root.update_attribute(:updated_at, @memo.updated_at)
|
|
|
|
|
|
|
|
format.js
|
|
|
|
format.html {redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}"}
|
|
|
|
format.html {redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}"}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
|
|
|
|
format.js
|
|
|
|
format.html { render action: "edit" }
|
|
|
|
format.html { render action: "edit" }
|
|
|
|
format.json { render json: @person.errors, status: :unprocessable_entity }
|
|
|
|
format.json { render json: @person.errors, status: :unprocessable_entity }
|
|
|
|
end
|
|
|
|
end
|
|
|
|