diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2018-09-23 13:58:45 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2018-09-23 13:58:45 +0000 |
| commit | 8eb8cdc06d6980e8f7cbae21d22264980a93cd01 (patch) | |
| tree | 75614c008ecbf81ecc1c59979f5cba551a900cc3 | |
| parent | b085b2fce1e244aae43a300578f0d002fbf224da (diff) | |
| download | redmine-8eb8cdc06d6980e8f7cbae21d22264980a93cd01.tar.gz redmine-8eb8cdc06d6980e8f7cbae21d22264980a93cd01.zip | |
Remove link to current version, already present in the page breadcrumb (#26575).
git-svn-id: http://svn.redmine.org/redmine/trunk@17510 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/wiki/show.html.erb | 3 | ||||
| -rw-r--r-- | test/functional/wiki_controller_test.rb | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb index caa35eb08..311eec1c4 100644 --- a/app/views/wiki/show.html.erb +++ b/app/views/wiki/show.html.erb @@ -33,8 +33,7 @@ :version => @content.version) + ')'.html_safe if @content.previous %> - <%= 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, :version => nil) %> + :version => @content.next.version) if @content.next %> <br /> <em><%= @content.author ? link_to_user(@content.author) : l(:label_user_anonymous) %>, <%= format_time(@content.updated_on) %> </em><br /> diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb index 0583882e1..7f658be0b 100644 --- a/test/functional/wiki_controller_test.rb +++ b/test/functional/wiki_controller_test.rb @@ -65,7 +65,6 @@ class WikiControllerTest < Redmine::ControllerTest assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation/1', :text => /Previous/ assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation/2/diff', :text => /diff/ assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation/3', :text => /Next/ - assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation', :text => /Current version/ end def test_show_old_version_with_attachments @@ -77,7 +76,6 @@ class WikiControllerTest < Redmine::ControllerTest get :show, :params => {:project_id => 'ecookbook', :id => page.title, :version => '1'} assert_response :success - assert_select 'a[href=?]', '/projects/ecookbook/wiki/Page_with_an_inline_image', :text => /Current version/ end def test_show_old_version_without_permission_should_be_denied @@ -96,7 +94,6 @@ class WikiControllerTest < Redmine::ControllerTest assert_select 'a', :text => /Previous/, :count => 0 assert_select 'a', :text => /diff/, :count => 0 assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation/2', :text => /Next/ - assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation', :text => /Current version/ end def test_show_redirected_page |