meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-10 19:23:06 +00:00
Code Issues Releases Wiki Activity

Merged r17359 and r17360 from trunk to 3.4-stable (#28693).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17361 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2018-06-03 01:30:33 +00:00
parent dea63c894b
commit 0ab0f93786
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/redmine.rb
View File

@ -126,7 +126,7 @@ Redmine::AccessControl.map do |map|
map.permission :log_time, {:timelog => [:new, :create]}, :require => :loggedin
map.permission :edit_time_entries, {:timelog => [:edit, :update, :destroy, :bulk_edit, :bulk_update]}, :require => :member
map.permission :edit_own_time_entries, {:timelog => [:edit, :update, :destroy,:bulk_edit, :bulk_update]}, :require => :loggedin
map.permission :manage_project_activities, {:project_enumerations => [:update, :destroy]}, :require => :member
map.permission :manage_project_activities, {:projects => :settings, :project_enumerations => [:update, :destroy]}, :require => :member
end
map.project_module :news do |map|
@ -164,7 +164,7 @@ Redmine::AccessControl.map do |map|
map.permission :browse_repository, {:repositories => [:show, :browse, :entry, :raw, :annotate, :changes, :diff, :stats, :graph]}, :read => true
map.permission :commit_access, {}
map.permission :manage_related_issues, {:repositories => [:add_related_issue, :remove_related_issue]}
map.permission :manage_repository, {:repositories => [:new, :create, :edit, :update, :committers, :destroy]}, :require => :member
map.permission :manage_repository, {:projects => :settings, :repositories => [:new, :create, :edit, :update, :committers, :destroy]}, :require => :member
end
map.project_module :boards do |map|
@ -174,7 +174,7 @@ Redmine::AccessControl.map do |map|
map.permission :edit_own_messages, {:messages => :edit, :attachments => :upload}, :require => :loggedin
map.permission :delete_messages, {:messages => :destroy}, :require => :member
map.permission :delete_own_messages, {:messages => :destroy}, :require => :loggedin
map.permission :manage_boards, {:boards => [:new, :create, :edit, :update, :destroy]}, :require => :member
map.permission :manage_boards, {:projects => :settings, :boards => [:new, :create, :edit, :update, :destroy]}, :require => :member
end
map.project_module :calendar do |map|

22
test/functional/projects_controller_test.rb
View File

@ -661,6 +661,28 @@ class ProjectsControllerTest < Redmine::ControllerTest
assert_select "tr#member-#{member.id}"
end
def test_settings_should_show_tabs_depending_on_permission
@request.session[:user_id] = 3
role = User.find(3).roles.first
role.permissions = []
role.save
get :settings, :params => {
:id => 'ecookbook'
}
assert_response 403
role.add_permission! :manage_repository, :manage_boards, :manage_project_activities
get :settings, :params => {
:id => 'ecookbook'
}
assert_response :success
assert_select 'a[id^=tab-]', 3
assert_select 'a#tab-repositories'
assert_select 'a#tab-boards'
assert_select 'a#tab-activities'
end
def test_update
@request.session[:user_id] = 2 # manager
post :update, :params => {