diff options
| -rw-r--r-- | app/views/wiki/show.html.erb | 2 | ||||
| -rw-r--r-- | test/functional/wiki_controller_test.rb | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb index 6a0245809..be0d7355a 100644 --- a/app/views/wiki/show.html.erb +++ b/app/views/wiki/show.html.erb @@ -85,7 +85,7 @@ <p class="wiki-update-info"> <% if User.current.allowed_to?(:view_wiki_edits, @project) %> <%= wiki_content_update_info(@content) %> - · <%= link_to l(:label_x_revisions, :count => @content.version), {:action => 'history', :id => @page.title} %> + · <%= link_to l(:label_x_revisions, :count => @page.content.versions.size), {:action => 'history', :id => @page.title} %> <% end %> <% if @page.protected? %> <span class="badge badge-status-locked"><%= l('status_locked') %></span> diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb index 215c9caf4..1e1d98f32 100644 --- a/test/functional/wiki_controller_test.rb +++ b/test/functional/wiki_controller_test.rb @@ -233,6 +233,20 @@ class WikiControllerTest < Redmine::ControllerTest end end + def test_show_should_display_revisions_count + # To ensure that the number of versions is correctly displayed instead of + # the last version number of the wiki page, make a situation where the + # those two numbers are different. + content_versions = WikiContentVersion.where(page_id: 1) + content_versions.first.destroy + assert 3, content_versions.last.version + assert 2, content_versions.size + + get :show, :params => {:project_id => 1, :id => 'CookBook_documentation'} + assert_response :success + assert_select 'a[href=?]', '/projects/1/wiki/CookBook_documentation/history', :text => /2 revisions/ + end + def test_get_new @request.session[:user_id] = 2 |