summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/redmine.rb1
-rw-r--r--lib/redmine/access_control.rb2
-rw-r--r--test/integration/api_test/memberships_test.rb8
3 files changed, 10 insertions, 1 deletions
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 0c78b99d9..d35f82847 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -86,6 +86,7 @@ Redmine::AccessControl.map do |map|
map.permission :edit_project, {:projects => [:settings, :edit, :update]}, :require => :member
map.permission :close_project, {:projects => [:close, :reopen]}, :require => :member, :read => true
map.permission :select_project_modules, {:projects => :modules}, :require => :member
+ map.permission :view_members, {:members => [:index, :show]}, :public => true, :read => true
map.permission :manage_members, {:projects => :settings, :members => [:index, :show, :create, :update, :destroy, :autocomplete]}, :require => :member
map.permission :manage_versions, {:projects => :settings, :versions => [:new, :create, :edit, :update, :close_completed, :destroy]}, :require => :member
map.permission :add_subprojects, {:projects => [:new, :create]}, :require => :member
diff --git a/lib/redmine/access_control.rb b/lib/redmine/access_control.rb
index 7c4a5a5ec..56927845d 100644
--- a/lib/redmine/access_control.rb
+++ b/lib/redmine/access_control.rb
@@ -60,7 +60,7 @@ module Redmine
!perm.nil? && perm.read?
else
s = "#{action[:controller]}/#{action[:action]}"
- permissions.detect {|p| p.actions.include?(s) && !p.read?}.nil?
+ permissions.detect {|p| p.actions.include?(s) && p.read?}.present?
end
end
diff --git a/test/integration/api_test/memberships_test.rb b/test/integration/api_test/memberships_test.rb
index 626282054..0a319420f 100644
--- a/test/integration/api_test/memberships_test.rb
+++ b/test/integration/api_test/memberships_test.rb
@@ -73,6 +73,14 @@ class Redmine::ApiTest::MembershipsTest < Redmine::ApiTest::Base
json)
end
+ test "GET /projects/:project_id/memberships.xml should succeed for closed project" do
+ project = Project.find(1)
+ project.close
+ assert !project.reload.active?
+ get '/projects/1/memberships.json', {}, credentials('jsmith')
+ assert_response :success
+ end
+
test "POST /projects/:project_id/memberships.xml should create the membership" do
assert_difference 'Member.count' do
post '/projects/1/memberships.xml', {:membership => {:user_id => 7, :role_ids => [2,3]}}, credentials('jsmith')