jro_apps/redmine Commit - r10476:d66b3452db77

Wiki page versions routes cleanup....

Jean-Philippe Lang -

r10476:d66b3452db77

parent child

Context file:

r10476:d66b3452db77

Collapse all files

app/helpers/application_helper.rb +2 -2

                   content << "<ul class=\"pages-hierarchy\">\n"
                   pages[node].each do |page|
                     content << "<li>"
-                    content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'show', :project_id => page.project, :id => page.title},
+                    content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'show', :project_id => page.project, :id => page.title, :version => nil},
                                        :title => (options[:timestamp] && page.updated_on ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil))
                     content << "\n" + render_page_hierarchy(pages, page.id, options) if pages[page.id]
                     content << "</li>\n"
                           wiki_page_id = page.present? ? Wiki.titleize(page) : nil
                           parent = wiki_page.nil? && obj.is_a?(WikiContent) && obj.page && project == link_project ? obj.page.title : nil
                           url_for(:only_path => only_path, :controller => 'wiki', :action => 'show', :project_id => link_project,
-                           :id => wiki_page_id, :anchor => anchor, :parent => parent)
+                           :id => wiki_page_id, :version => nil, :anchor => anchor, :parent => parent)
                         end
                       end
                       link_to(title.present? ? title.html_safe : h(page), url, :class => ('wiki-page' + (wiki_page ? '' : ' new')))

app/helpers/wiki_helper.rb +1 -1

               def wiki_page_breadcrumb(page)
                 breadcrumb(page.ancestors.reverse.collect {|parent|
-                  link_to(h(parent.pretty_title), {:controller => 'wiki', :action => 'show', :id => parent.title, :project_id => parent.project})
+                  link_to(h(parent.pretty_title), {:controller => 'wiki', :action => 'show', :id => parent.title, :project_id => parent.project, :version => nil})
                 })
               end
             end

app/views/wiki/show.html.erb +1 -1

                 <%= link_to((l(:label_next) + " \xc2\xbb"), :action => 'show',
                             :id => @page.title, :project_id => @page.project,
                             :version => @content.next.version) + " - " if @content.next %>
-                <%= link_to(l(:label_current_version), :action => 'show', :id => @page.title, :project_id => @page.project) %>
+                <%= link_to(l(:label_current_version), :action => 'show', :id => @page.title, :project_id => @page.project, :version => nil) %>
                 <br />
                 <em><%= @content.author ? link_to_user(@content.author) : l(:label_user_anonymous)
                      %>, <%= format_time(@content.updated_on) %> </em><br />

config/routes.rb +3 -3

                 end
                 match 'wiki/index', :controller => 'wiki', :action => 'index', :via => :get
-                match 'wiki/:id/diff/:version/vs/:version_from', :controller => 'wiki', :action => 'diff'
-                match 'wiki/:id/diff/:version', :controller => 'wiki', :action => 'diff'
                 resources :wiki, :except => [:index, :new, :create] do
                   member do
                     get 'rename'
                   end
                 end
                 match 'wiki', :controller => 'wiki', :action => 'show', :via => :get
-                match 'wiki/:id/annotate/:version', :controller => 'wiki', :action => 'annotate'
+                get 'wiki/:id/:version', :to => 'wiki#show'
+                get 'wiki/:id/:version/annotate', :to => 'wiki#annotate'
+                get 'wiki/:id/:version/diff', :to => 'wiki#diff'
               end
               resources :issues do

test/functional/wiki_controller_test.rb +28 -1

@@ -64,6 +64,28 class WikiControllerTest < ActionController::TestCase
64	:alt => 'This is a logo' }	64	:alt => 'This is a logo' }
65	end	65	end
66		66
		67	def test_show_old_version
		68	get :show, :project_id => 'ecookbook', :id => 'CookBook_documentation', :version => '2'
		69	assert_response :success
		70	assert_template 'show'
		71
		72	assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation/1', :text => /Previous/
		73	assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation/2/diff', :text => /diff/
		74	assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation/3', :text => /Next/
		75	assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation', :text => /Current version/
		76	end
		77
		78	def test_show_first_version
		79	get :show, :project_id => 'ecookbook', :id => 'CookBook_documentation', :version => '1'
		80	assert_response :success
		81	assert_template 'show'
		82
		83	assert_select 'a', :text => /Previous/, :count => 0
		84	assert_select 'a', :text => /diff/, :count => 0
		85	assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation/2', :text => /Next/
		86	assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation', :text => /Current version/
		87	end
		88
67	def test_show_redirected_page	89	def test_show_redirected_page
68	WikiRedirect.create!(:wiki_id => 1, :title => 'Old_title', :redirects_to => 'Another_page')	90	WikiRedirect.create!(:wiki_id => 1, :title => 'Old_title', :redirects_to => 'Another_page')
69		91
@@ -477,12 +499,17 class WikiControllerTest < ActionController::TestCase
477	end	499	end
478		500
479	def test_history	501	def test_history
480	get :history, :project_id => 1, :id => 'CookBook_documentation'	502	get :history, :project_id => 'ecookbook', :id => 'CookBook_documentation'
481	assert_response :success	503	assert_response :success
482	assert_template 'history'	504	assert_template 'history'
483	assert_not_nil assigns(:versions)	505	assert_not_nil assigns(:versions)
484	assert_equal 3, assigns(:versions).size	506	assert_equal 3, assigns(:versions).size
		507
485	assert_select "input[type=submit][name=commit]"	508	assert_select "input[type=submit][name=commit]"
		509	assert_select 'td' do
		510	assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation/2', :text => '2'
		511	assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation/2/annotate'
		512	end
486	end	513	end
487		514
488	def test_history_with_one_version	515	def test_history_with_one_version

test/integration/routing/wiki_test.rb +2 -7

                        :id => 'CookBook_documentation' }
                    )
                 assert_routing(
-                     { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/diff/2" },
+                     { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/2/diff" },
                      { :controller => 'wiki', :action => 'diff', :project_id => '1',
                        :id => 'CookBook_documentation', :version => '2' }
                    )
                 assert_routing(
-                     { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/diff/2/vs/1" },
+                     { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/2/annotate" },
-                     { :controller => 'wiki', :action => 'diff', :project_id => '1',
-                       :id => 'CookBook_documentation', :version => '2', :version_from => '1' }
-                assert_routing(
-                     { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/annotate/2" },
                      { :controller => 'wiki', :action => 'annotate', :project_id => '1',
                        :id => 'CookBook_documentation', :version => '2' }
                    )

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