Show locked badge for protected pages (#9634).

Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@18085 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb
index 93a358346e1e34a89c64e2dc6184e2b878b6714e..92f86e8437111ae7703ce80462aec85e5491ab4b 100644 (file)
--- a/app/views/wiki/show.html.erb
+++ b/app/views/wiki/show.html.erb
@@ -82,12 +82,15 @@
 </div>
 </fieldset>
 
-<% if User.current.allowed_to?(:view_wiki_edits, @project) %>
 <p class="wiki-update-info">
-  <%= wiki_content_update_info(@content) %>
- · <%= link_to l(:label_x_revisions, :count => @content.version), {:action => 'history', :id => @page.title} %>
+  <% 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} %>
+  <% end %>
+  <% if @page.protected? %>
+    <span class="badge badge-status-locked"><%= l('status_locked') %></span>
+  <% end %>
 </p>
-<% end %>
 
 <% other_formats_links do |f| %>
   <%= f.link_to 'PDF', :url => {:id => @page.title, :version => params[:version]} %>

diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index b416f8a01ae142d0311d32cfc5f3e79a6ed2b1c0..c3d7563ab2f7cf7e5b88d591bbe3f7f794bac715 100644 (file)
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -176,6 +176,16 @@ class WikiControllerTest < Redmine::ControllerTest
     assert_select 'textarea[name=?]', 'content[text]'
   end
 
+  def test_show_protected_page_shoud_show_locked_badge
+    @request.session[:user_id] = 2
+
+    get :show, :params => {:project_id => 1, :id => 'CookBook_documentation'}
+
+    assert_select 'p.wiki-update-info' do
+      assert_select 'span.badge.badge-status-locked'
+    end
+  end
+
   def test_get_new
     @request.session[:user_id] = 2