jro_apps/redmine Commit - r4147:c06c22cf2e29

Refactor: extract method from WikiController#special...

Eric Davis -

r4147:c06c22cf2e29

parent child

Context file:

r4147:c06c22cf2e29

app/controllers/wiki_controller.rb +4 -3

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

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

             <%= link_to l(:field_start_page), {:action => 'index', :page => nil} %><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 />
+            <%= link_to l(:label_index_by_date), {:action => 'date_index'} %><br />

app/views/wiki/date_index.html.erb ~~app/views/wiki/special_date_index.rhtml~~ renamed 0 0

NO CONTENT: file renamed from app/views/wiki/special_date_index.rhtml to app/views/wiki/date_index.html.erb

config/routes.rb +1 -1

                 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_index', :action => 'page_index'
-                  wiki_views.connect 'projects/:id/wiki/:page', :action => 'special', :page => /date_index/i
+                  wiki_views.connect 'projects/:id/wiki/date_index', :action => 'date_index'
                   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, :page_index]
+                map.permission :view_wiki_pages, :wiki => [:index, :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]

test/functional/wiki_controller_test.rb +12 0

@@ -284,6 +284,18 class WikiControllerTest < ActionController::TestCase
284	end	284	end
285	end	285	end
286	end	286	end
		287
		288	context "GET :date_index" do
		289	setup do
		290	get :date_index, :id => 'ecookbook'
		291	end
		292
		293	should_respond_with :success
		294	should_assign_to :pages
		295	should_assign_to :pages_by_date
		296	should_render_template 'wiki/date_index'
		297
		298	end
287		299
288	def test_not_found	300	def test_not_found
289	get :index, :id => 999	301	get :index, :id => 999

test/integration/routing_test.rb +1 -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 => 'page_index', :id => '567'
-                should_route :get, "/projects/567/wiki/date_index", :controller => 'wiki', :action => 'special', :id => '567', :page => 'date_index'
+                should_route :get, "/projects/567/wiki/date_index", :controller => 'wiki', :action => 'date_index', :id => '567'
                 should_route :get, "/projects/567/wiki/export", :controller => 'wiki', :action => 'export', :id => '567'
                 should_route :post, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'edit', :id => '567', :page => 'my_page'

General Comments 0

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

No TODOs yet

	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