summaryrefslogtreecommitdiff
path: root/lib/api/project_members.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/api/project_members.rb')
-rw-r--r--lib/api/project_members.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/api/project_members.rb b/lib/api/project_members.rb
index 47c4ddce163..1595ed0bc36 100644
--- a/lib/api/project_members.rb
+++ b/lib/api/project_members.rb
@@ -6,8 +6,8 @@ module API
resource :projects do
helpers do
def handle_project_member_errors(errors)
- if errors[:project_access].any?
- error!(errors[:project_access], 422)
+ if errors[:access_level].any?
+ error!(errors[:access_level], 422)
end
not_found!
end
@@ -56,9 +56,9 @@ module API
# either the user is already a team member or a new one
team_member = user_project.team_member_by_id(params[:user_id])
if team_member.nil?
- team_member = user_project.users_projects.new(
+ team_member = user_project.project_members.new(
user_id: params[:user_id],
- project_access: params[:access_level]
+ access_level: params[:access_level]
)
end
@@ -82,10 +82,10 @@ module API
authorize! :admin_project, user_project
required_attributes! [:access_level]
- team_member = user_project.users_projects.find_by(user_id: params[:user_id])
+ team_member = user_project.project_members.find_by(user_id: params[:user_id])
not_found!("User can not be found") if team_member.nil?
- if team_member.update_attributes(project_access: params[:access_level])
+ if team_member.update_attributes(access_level: params[:access_level])
@member = team_member.user
present @member, with: Entities::ProjectMember, project: user_project
else
@@ -102,7 +102,7 @@ module API
# DELETE /projects/:id/members/:user_id
delete ":id/members/:user_id" do
authorize! :admin_project, user_project
- team_member = user_project.users_projects.find_by(user_id: params[:user_id])
+ team_member = user_project.project_members.find_by(user_id: params[:user_id])
unless team_member.nil?
team_member.destroy
else