jro_apps/redmine Commit - r4139:027110579438

Refactor: extract #page_index from WikiController#special...

Eric Davis -

r4139:027110579438

parent child

Context file:

r4139:027110579438

Collapse all files

app/controllers/wiki_controller.rb +6 -2

                   end
                 end
                 @page.destroy
-                redirect_to :action => 'special', :id => @project, :page => 'Page_index'
+                redirect_to :action => 'page_index', :id => @project
               end
               # display special pages
                 page_title = params[:page].downcase
                 case page_title
                 # show pages index, sorted by title
-                when 'page_index', 'date_index'
+                when 'date_index'
                   load_pages_grouped_by_date_without_content
                 when 'export'
                   redirect_to :action => 'export', :id => @project # Compatibility stub while refactoring
                   redirect_to :action => 'index', :id => @project, :page => nil
                 end
               end
+              def page_index
+                load_pages_grouped_by_date_without_content
+              end
               def preview
                 page = @wiki.find_page(params[:page])

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

             <h3><%= l(:label_wiki) %></h3>
             <%= link_to l(:field_start_page), {:action => 'index', :page => nil} %><br />
-            <%= link_to l(:label_index_by_title), {:action => 'special', :page => 'Page_index'} %><br />
+            <%= link_to l(:label_index_by_title), {:action => 'page_index'} %><br />
             <%= link_to l(:label_index_by_date), {:action => 'special', :page => 'Date_index'} %><br />

app/views/wiki/page_index.html.erb ~~app/views/wiki/special_page_index.rhtml~~ renamed 0 0

NO CONTENT: file renamed from app/views/wiki/special_page_index.rhtml to app/views/wiki/page_index.html.erb

config/routes.rb +2 -1

               map.with_options :controller => 'wiki' do |wiki_routes|
                 wiki_routes.with_options :conditions => {:method => :get} do |wiki_views|
                   wiki_views.connect 'projects/:id/wiki/export', :action => 'export'
-                  wiki_views.connect 'projects/:id/wiki/:page', :action => 'special', :page => /page_index|date_index/i
+                  wiki_views.connect 'projects/:id/wiki/page_index', :action => 'page_index'
+                  wiki_views.connect 'projects/:id/wiki/:page', :action => 'special', :page => /date_index/i
                   wiki_views.connect 'projects/:id/wiki/:page', :action => 'index', :page => nil
                   wiki_views.connect 'projects/:id/wiki/:page/edit', :action => 'edit'
                   wiki_views.connect 'projects/:id/wiki/:page/rename', :action => 'rename'

lib/redmine.rb +1 -1

                 map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member
                 map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member
                 map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member
-                map.permission :view_wiki_pages, :wiki => [:index, :special]
+                map.permission :view_wiki_pages, :wiki => [:index, :special, :page_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]

test/functional/wiki_controller_test.rb +6 -6

               def test_destroy_child
                 @request.session[:user_id] = 2
                 post :destroy, :id => 1, :page => 'Child_1'
-                assert_redirected_to :action => 'special', :id => 'ecookbook', :page => 'Page_index'
+                assert_redirected_to :action => 'page_index', :id => 'ecookbook'
               end
               def test_destroy_parent
                 assert_difference('WikiPage.count', -1) do
                   post :destroy, :id => 1, :page => 'Another_page', :todo => 'nullify'
                 end
-                assert_redirected_to :action => 'special', :id => 'ecookbook', :page => 'Page_index'
+                assert_redirected_to :action => 'page_index', :id => 'ecookbook'
                 assert_nil WikiPage.find_by_id(2)
               end
                 assert_difference('WikiPage.count', -3) do
                   post :destroy, :id => 1, :page => 'Another_page', :todo => 'destroy'
                 end
-                assert_redirected_to :action => 'special', :id => 'ecookbook', :page => 'Page_index'
+                assert_redirected_to :action => 'page_index', :id => 'ecookbook'
                 assert_nil WikiPage.find_by_id(2)
                 assert_nil WikiPage.find_by_id(5)
               end
                 assert_difference('WikiPage.count', -1) do
                   post :destroy, :id => 1, :page => 'Another_page', :todo => 'reassign', :reassign_to_id => 1
                 end
-                assert_redirected_to :action => 'special', :id => 'ecookbook', :page => 'Page_index'
+                assert_redirected_to :action => 'page_index', :id => 'ecookbook'
                 assert_nil WikiPage.find_by_id(2)
                 assert_equal WikiPage.find(1), WikiPage.find_by_id(5).parent
               end
               def test_page_index
-                get :special, :id => 'ecookbook', :page => 'Page_index'
+                get :page_index, :id => 'ecookbook'
                 assert_response :success
-                assert_template 'special_page_index'
+                assert_template 'page_index'
                 pages = assigns(:pages)
                 assert_not_nil pages
                 assert_equal Project.find(1).wiki.pages.size, pages.size

test/integration/routing_test.rb +1 -2

                 should_route :get, "/projects/1/wiki/CookBook_documentation/diff/2/vs/1", :controller => 'wiki', :action => 'diff', :id => '1', :page => 'CookBook_documentation', :version => '2', :version_from => '1'
                 should_route :get, "/projects/1/wiki/CookBook_documentation/annotate/2", :controller => 'wiki', :action => 'annotate', :id => '1', :page => 'CookBook_documentation', :version => '2'
                 should_route :get, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :id => '22', :page => 'ladida'
-                should_route :get, "/projects/567/wiki/page_index", :controller => 'wiki', :action => 'special', :id => '567', :page => 'page_index'
+                should_route :get, "/projects/567/wiki/page_index", :controller => 'wiki', :action => 'page_index', :id => '567'
-                should_route :get, "/projects/567/wiki/Page_Index", :controller => 'wiki', :action => 'special', :id => '567', :page => 'Page_Index'
                 should_route :get, "/projects/567/wiki/date_index", :controller => 'wiki', :action => 'special', :id => '567', :page => 'date_index'
                 should_route :get, "/projects/567/wiki/export", :controller => 'wiki', :action => 'export', :id => '567'

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