Merged r18013 to 4.0-stable (#30731).

git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18017 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/repositories/_revisions.html.erb b/app/views/repositories/_revisions.html.erb
index 914999b342bda63229b8455492fd54ff28248d57..51438079119e6df72ec7cce679b42e9146302ba6 100644 (file)
--- a/app/views/repositories/_revisions.html.erb
+++ b/app/views/repositories/_revisions.html.erb
@@ -20,7 +20,7 @@ end %>
        :repository_id => @repository.identifier_param, :path => to_path_param(path)},
       :method => :get
      ) do %>
-<% show_diff = revisions.size > 1 %>
+<% show_diff = revisions.size > 1 && User.current.allowed_to?(:browse_repository, @repository.project) %>
 <%= submit_tag(l(:label_view_diff), :name => nil) if show_diff %>
 <table class="list changesets">
 <thead><tr>

diff --git a/test/functional/repositories_controller_test.rb b/test/functional/repositories_controller_test.rb
index 8338b8987eae6b965290e63c9f270f4e24f845f8..5d8172cf3878630b26e7b96f3aa5b04ff953412f 100644 (file)
--- a/test/functional/repositories_controller_test.rb
+++ b/test/functional/repositories_controller_test.rb
@@ -180,6 +180,25 @@ class RepositoriesControllerTest < Redmine::RepositoryControllerTest
     end
   end
 
+  def test_show_should_show_diff_button_depending_on_browse_repository_permission
+    @request.session[:user_id] = 2
+    role = Role.find(1)
+
+    role.add_permission! :browse_repository
+    get :show, :params => {
+      :id => 1
+    }
+    assert_response :success
+    assert_select 'input[value="View differences"]'
+
+    role.remove_permission! :browse_repository
+    get :show, :params => {
+      :id => 1
+    }
+    assert_response :success
+    assert_select 'input[value="View differences"]', :count => 0
+  end
+
   def test_revisions
     get :revisions, :params => {
         :id => 1,