Merged r21800 from trunk to 5.0-stable (#37585).

git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21802 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/repositories/_link_to_functions.html.erb b/app/views/repositories/_link_to_functions.html.erb
index 9c89561c38daaac4c0e1ac9122d2ef41c6948a6d..bfdc99cc44160992bdbc1674a787eb87f4b4fcf2 100644 (file)
--- a/app/views/repositories/_link_to_functions.html.erb
+++ b/app/views/repositories/_link_to_functions.html.erb
@@ -8,7 +8,7 @@ tabs << { name: 'entry', label: :button_view,
 
 tabs << { name: 'changes', label: :label_history,
           url: {:action => 'changes', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev }
-        }
+        } if @repository.supports_all_revisions?
 tabs << { name: 'annotate', label: :button_annotate,
           url: {:action => 'annotate', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev }
         } if @repository.supports_annotate?

diff --git a/test/functional/repositories_filesystem_controller_test.rb b/test/functional/repositories_filesystem_controller_test.rb
index 42c1f7decb691cf8058c46898c00eb7930d4efc5..92f0edf8f6c1246e58c8343be1108f73c774d650 100644 (file)
--- a/test/functional/repositories_filesystem_controller_test.rb
+++ b/test/functional/repositories_filesystem_controller_test.rb
@@ -202,6 +202,24 @@ class RepositoriesFilesystemControllerTest < Redmine::RepositoryControllerTest
       @project.reload
       assert_nil @project.repository
     end
+
+    def test_show_should_only_show_view_tab
+      get(
+        :entry,
+        :params => {
+          :id => PRJ_ID,
+          :repository_id => @repository.id,
+          :path => repository_path_hash(['test'])[:param]
+        }
+      )
+      assert_response :success
+      assert @repository.supports_cat?
+      assert_select 'a#tab-entry', :text => /View/
+      assert_not @repository.supports_all_revisions?
+      assert_select 'a#tab-changes', 0
+      assert_not @repository.supports_annotate?
+      assert_select 'a#tab-annotate', 0
+    end
   else
     puts "Filesystem test repository NOT FOUND. Skipping functional tests !!!"
     def test_fake; assert true end