Mercurial > hg > soundsoftware-site
comparison app/controllers/.svn/text-base/wiki_controller.rb.svn-base @ 117:af80e5618e9b redmine-1.1
* Update to Redmine 1.1-stable branch (Redmine SVN rev 4707)
author | Chris Cannam |
---|---|
date | Thu, 13 Jan 2011 12:53:21 +0000 |
parents | 94944d00e43c |
children | cbce1fd3b1b7 |
comparison
equal
deleted
inserted
replaced
39:150ceac17a8d | 117:af80e5618e9b |
---|---|
123 if (@page.new_record? ? @page.save : @content.save) | 123 if (@page.new_record? ? @page.save : @content.save) |
124 attachments = Attachment.attach_files(@page, params[:attachments]) | 124 attachments = Attachment.attach_files(@page, params[:attachments]) |
125 render_attachment_warning_if_needed(@page) | 125 render_attachment_warning_if_needed(@page) |
126 call_hook(:controller_wiki_edit_after_save, { :params => params, :page => @page}) | 126 call_hook(:controller_wiki_edit_after_save, { :params => params, :page => @page}) |
127 redirect_to :action => 'show', :project_id => @project, :id => @page.title | 127 redirect_to :action => 'show', :project_id => @project, :id => @page.title |
128 else | |
129 render :action => 'edit' | |
128 end | 130 end |
129 | 131 |
130 rescue ActiveRecord::StaleObjectError | 132 rescue ActiveRecord::StaleObjectError |
131 # Optimistic locking exception | 133 # Optimistic locking exception |
132 flash[:error] = l(:notice_locking_conflict) | 134 flash[:error] = l(:notice_locking_conflict) |