Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-15 09:46:02 +01:00
Code Issues Packages Projects Releases Activity

Invalid links to versions with sharing in project tree (#32860).

Browse Source 
Patch by Alexander Meindl.


git-svn-id: http://svn.redmine.org/redmine/trunk@20149 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2020-10-18 02:28:27 +00:00
parent e48ff48820
commit ba016c5d77
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/helpers/versions_helper.rb
View File

@@ -31,11 +31,11 @@ module VersionsHelper
options = {:fixed_version_id => version, :set_filter => 1}.merge(options) options = {:fixed_version_id => version, :set_filter => 1}.merge(options)
project = project =
case version.sharing case version.sharing
when 'hierarchy', 'tree' when 'tree'
if version.project && version.project.root.visible? if version.project && version.project.root.visible? && User.current.allowed_to?(:view_issues, version.project.root)
version.project.root version.project.root
else else
version.project nil
end end
when 'system' when 'system'
nil nil

10
test/helpers/version_helper_test.rb
View File

@@ -42,7 +42,7 @@ class VersionsHelperTest < Redmine::HelperTest
def test_version_filtered_issues_path_sharing_hierarchy def test_version_filtered_issues_path_sharing_hierarchy
version = Version.new(:name => 'test', :sharing => 'hierarchy') version = Version.new(:name => 'test', :sharing => 'hierarchy')
version.project = Project.find(5) version.project = Project.find(5)
assert_match '/projects/ecookbook/issues?', version_filtered_issues_path(version) assert_match '/projects/private-child/issues?', version_filtered_issues_path(version)
end end
def test_version_filtered_issues_path_sharing_tree def test_version_filtered_issues_path_sharing_tree
@@ -51,6 +51,14 @@ class VersionsHelperTest < Redmine::HelperTest
assert_match '/projects/ecookbook/issues?', version_filtered_issues_path(version) assert_match '/projects/ecookbook/issues?', version_filtered_issues_path(version)
end end
def test_version_filtered_issues_path_sharing_tree_without_permission_to_root_project
EnabledModule.where("name = 'issue_tracking' AND project_id = 1").delete_all
version = Version.new(:name => 'test', :sharing => 'tree')
version.project = Project.find(5)
assert_no_match '/projects/ecookbook/issues?', version_filtered_issues_path(version)
assert_match '/issues?', version_filtered_issues_path(version)
end
def test_version_filtered_issues_path_sharing_system def test_version_filtered_issues_path_sharing_system
version = Version.new(:name => 'test', :sharing => 'system') version = Version.new(:name => 'test', :sharing => 'system')
version.project = Project.find(5) version.project = Project.find(5)