Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-02-07 23:30:13 +01:00
Code Issues Packages Projects Releases Activity

Merged r21357 from trunk to 4.2-stable (#35090).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/4.2-stable@21360 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2022-01-12 14:07:42 +00:00
parent 5243bc5a6c
commit c7b7eb365a
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/issues/index.html.erb
View File

@@ -13,7 +13,7 @@
<%= link_to_if_authorized l(:label_settings),
{:controller => 'projects', :action => 'settings', :id => @project, :tab => 'issues'},
:class => 'icon icon-settings' if User.current.allowed_to?(:manage_categories, @project) %>
:class => 'icon icon-settings' if User.current.allowed_to?(:edit_project, @project) %>
<% end %>
</div>

16
test/functional/issues_controller_test.rb
View File

@@ -2005,6 +2005,22 @@ class IssuesControllerTest < Redmine::ControllerTest
assert_select '#content a.new-issue[href="/issues/new"]', :text => 'New issue'
end
def test_index_should_show_setting_link_with_edit_project_permission
role = Role.find(1)
role.add_permission! :edit_project
@request.session[:user_id] = 2
get(:index, :params => {:project_id => 1})
assert_select '#content a.icon-settings[href="/projects/ecookbook/settings/issues"]', 1
end
def test_index_should_not_show_setting_link_without_edit_project_permission
role = Role.find(1)
role.remove_permission! :edit_project
@request.session[:user_id] = 2
get(:index, :params => {:project_id => 1})
assert_select '#content a.icon-settings[href="/projects/ecookbook/settings/issues"]', 0
end
def test_index_should_not_include_new_issue_tab_when_disabled
with_settings :new_item_menu_tab => '0' do
@request.session[:user_id] = 2