diff options
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/entities.rb | 16 | ||||
| -rw-r--r-- | lib/api/groups.rb | 8 | ||||
| -rw-r--r-- | lib/api/project_members.rb | 14 |
3 files changed, 19 insertions, 19 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 74fdef93543..ffa3e8a149e 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -53,8 +53,8 @@ module API end class ProjectMember < UserBasic - expose :project_access, as: :access_level do |user, options| - options[:project].users_projects.find_by(user_id: user.id).project_access + expose :access_level do |user, options| + options[:project].project_members.find_by(user_id: user.id).access_level end end @@ -67,8 +67,8 @@ module API end class GroupMember < UserBasic - expose :group_access, as: :access_level do |user, options| - options[:group].users_groups.find_by(user_id: user.id).group_access + expose :access_level do |user, options| + options[:group].group_members.find_by(user_id: user.id).access_level end end @@ -170,24 +170,24 @@ module API end class ProjectAccess < Grape::Entity - expose :project_access, as: :access_level + expose :access_level expose :notification_level end class GroupAccess < Grape::Entity - expose :group_access, as: :access_level + expose :access_level expose :notification_level end class ProjectWithAccess < Project expose :permissions do expose :project_access, using: Entities::ProjectAccess do |project, options| - project.users_projects.find_by(user_id: options[:user].id) + project.project_members.find_by(user_id: options[:user].id) end expose :group_access, using: Entities::GroupAccess do |project, options| if project.group - project.group.users_groups.find_by(user_id: options[:user].id) + project.group.group_members.find_by(user_id: options[:user].id) end end end diff --git a/lib/api/groups.rb b/lib/api/groups.rb index caa2ca97a3e..4841e04689d 100644 --- a/lib/api/groups.rb +++ b/lib/api/groups.rb @@ -104,7 +104,7 @@ module API # GET /groups/:id/members get ":id/members" do group = find_group(params[:id]) - members = group.users_groups + members = group.group_members users = (paginate members).collect(&:user) present users, with: Entities::GroupMember, group: group end @@ -123,11 +123,11 @@ module API render_api_error!("Wrong access level", 422) end group = find_group(params[:id]) - if group.users_groups.find_by(user_id: params[:user_id]) + if group.group_members.find_by(user_id: params[:user_id]) render_api_error!("Already exists", 409) end group.add_users([params[:user_id]], params[:access_level]) - member = group.users_groups.find_by(user_id: params[:user_id]) + member = group.group_members.find_by(user_id: params[:user_id]) present member.user, with: Entities::GroupMember, group: group end @@ -141,7 +141,7 @@ module API # DELETE /groups/:id/members/:user_id delete ":id/members/:user_id" do group = find_group(params[:id]) - member = group.users_groups.find_by(user_id: params[:user_id]) + member = group.group_members.find_by(user_id: params[:user_id]) if member.nil? render_api_error!("404 Not Found - user_id:#{params[:user_id]} not a member of group #{group.name}",404) else 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 |