jro_apps/redmine Commit - r4158:cac3b1e5381d

Refactor: split WikiController#edit into #update...

Eric Davis -

r4158:cac3b1e5381d

parent child

Context file:

r4158:cac3b1e5381d

Collapse all files

app/controllers/wiki_controller.rb +20 -6

                 @content.text = initial_page_content(@page) if @content.text.blank?
                 # don't keep previous comment
                 @content.comments = nil
-                if request.get?
                 # To prevent StaleObjectError exception when reverting to a previous version
                 @content.version = @page.content.version
-                else
+              rescue ActiveRecord::StaleObjectError
-                  if !@page.new_record? && @content.text == params[:content][:text]
+                # Optimistic locking exception
+                flash[:error] = l(:notice_locking_conflict)
+              end
+              verify :method => :post, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
+              # Creates a new page or updates an existing one
+              def update
+                @page = @wiki.find_or_new_page(params[:page])
+                return render_403 unless editable?
+                @page.content = WikiContent.new(:page => @page) if @page.new_record?
+                @content = @page.content_for_version(params[:version])
+                @content.text = initial_page_content(@page) if @content.text.blank?
+                # don't keep previous comment
+                @content.comments = nil
+                if !@page.new_record? && params[:content].present? && @content.text == params[:content][:text]
                   attachments = Attachment.attach_files(@page, params[:attachments])
                   render_attachment_warning_if_needed(@page)
                   # don't save if text wasn't changed
                   redirect_to :action => 'show', :project_id => @project, :page => @page.title
                   return
                 end
-                  #@content.text = params[:content][:text]
-                  #@content.comments = params[:content][:comments]
                 @content.attributes = params[:content]
                 @content.author = User.current
                 # if page is new @page.save will also save content, but not if page isn't a new record
                   call_hook(:controller_wiki_edit_after_save, { :params => params, :page => @page})
                   redirect_to :action => 'show', :project_id => @project, :page => @page.title
                 end
-                end
               rescue ActiveRecord::StaleObjectError
                 # Optimistic locking exception
                 flash[:error] = l(:notice_locking_conflict)

app/views/wiki/edit.rhtml +1 -1

             <h2><%=h @page.pretty_title %></h2>
-            <% form_for :content, @content, :url => {:action => 'edit', :page => @page.title}, :html => {:multipart => true, :id => 'wiki_form'} do |f| %>
+            <% form_for :content, @content, :url => {:action => 'update', :page => @page.title}, :html => {:multipart => true, :id => 'wiki_form'} do |f| %>
             <%= f.hidden_field :version %>
             <%= error_messages_for 'content' %>

config/routes.rb +3 -1

                 end
                 wiki_routes.connect 'projects/:project_id/wiki/:page/:action',
-                  :action => /edit|rename|destroy|preview|protect/,
+                  :action => /rename|destroy|preview|protect/,
                   :conditions => {:method => :post}
+                wiki_routes.connect 'projects/:project_id/wiki/:page/edit', :action => 'update', :conditions => {:method => :post}
               end
               map.with_options :controller => 'messages' do |messages_routes|

lib/redmine.rb +1 -1

                 map.permission :view_wiki_pages, :wiki => [:show, :special, :page_index, :date_index]
                 map.permission :export_wiki_pages, :wiki => [:export]
                 map.permission :view_wiki_edits, :wiki => [:history, :diff, :annotate]
-                map.permission :edit_wiki_pages, :wiki => [:edit, :preview, :add_attachment]
+                map.permission :edit_wiki_pages, :wiki => [:edit, :update, :preview, :add_attachment]
                 map.permission :delete_wiki_pages_attachments, {}
                 map.permission :protect_wiki_pages, {:wiki => :protect}, :require => :member
               end

test/functional/wiki_controller_test.rb +2 -2

               def test_create_page
                 @request.session[:user_id] = 2
-                post :edit, :project_id => 1,
+                post :update, :project_id => 1,
                             :page => 'New page',
                             :content => {:comments => 'Created the page',
                                          :text => "h1. New page\n\nThis is a new page",
                 @request.session[:user_id] = 2
                 assert_difference 'WikiPage.count' do
                   assert_difference 'Attachment.count' do
-                    post :edit, :project_id => 1,
+                    post :update, :project_id => 1,
                                 :page => 'New page',
                                 :content => {:comments => 'Created the page',
                                              :text => "h1. New page\n\nThis is a new page",

test/integration/routing_test.rb +1 -1

                 should_route :get, "/projects/567/wiki/date_index", :controller => 'wiki', :action => 'date_index', :project_id => '567'
                 should_route :get, "/projects/567/wiki/export", :controller => 'wiki', :action => 'export', :project_id => '567'
-                should_route :post, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'edit', :project_id => '567', :page => 'my_page'
+                should_route :post, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'update', :project_id => '567', :page => 'my_page'
                 should_route :post, "/projects/567/wiki/CookBook_documentation/preview", :controller => 'wiki', :action => 'preview', :project_id => '567', :page => 'CookBook_documentation'
                 should_route :post, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :project_id => '22', :page => 'ladida'
                 should_route :post, "/projects/22/wiki/ladida/destroy", :controller => 'wiki', :action => 'destroy', :project_id => '22', :page => 'ladida'

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages