mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-10 13:16:09 +10:00
Douwe MaanandRémy Coutable
9af7d71bd6
Resolve "Destroying a project causes post_decline_request to be executed" ## What does this MR do? Ensure we don't send "access request declined" to access requesters when a project is deleted. ## Are there points in the code the reviewer needs to double check? I've created a service to decouple the notification sending from the AR model. ## Why was this MR needed? Because there was an issue. ## What are the relevant issue numbers? Fixes #18755, #18750. ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG needed. - [x] Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4744 Signed-off-by: Rémy Coutable <remy@rymai.me>
100 lines
2.9 KiB
Ruby
100 lines
2.9 KiB
Ruby
class Projects::ProjectMembersController < Projects::ApplicationController
|
|
include MembershipActions
|
|
|
|
# Authorize
|
|
before_action :authorize_admin_project_member!, except: [:index, :leave, :request_access]
|
|
|
|
def index
|
|
@project_members = @project.project_members
|
|
@project_members = @project_members.non_pending unless can?(current_user, :admin_project, @project)
|
|
|
|
if params[:search].present?
|
|
users = @project.users.search(params[:search]).to_a
|
|
@project_members = @project_members.where(user_id: users)
|
|
end
|
|
|
|
@project_members = @project_members.order('access_level DESC')
|
|
|
|
@group = @project.group
|
|
|
|
if @group
|
|
@group_members = @group.group_members
|
|
@group_members = @group_members.non_pending unless can?(current_user, :admin_group, @group)
|
|
|
|
if params[:search].present?
|
|
users = @group.users.search(params[:search]).to_a
|
|
@group_members = @group_members.where(user_id: users)
|
|
end
|
|
|
|
@group_members = @group_members.order('access_level DESC')
|
|
end
|
|
|
|
@project_member = @project.project_members.new
|
|
@project_group_links = @project.project_group_links
|
|
end
|
|
|
|
def create
|
|
@project.team.add_users(params[:user_ids].split(','), params[:access_level], current_user)
|
|
|
|
redirect_to namespace_project_project_members_path(@project.namespace, @project)
|
|
end
|
|
|
|
def update
|
|
@project_member = @project.project_members.find(params[:id])
|
|
|
|
return render_403 unless can?(current_user, :update_project_member, @project_member)
|
|
|
|
@project_member.update_attributes(member_params)
|
|
end
|
|
|
|
def destroy
|
|
@project_member = @project.project_members.find(params[:id])
|
|
|
|
Members::DestroyService.new(@project_member, current_user).execute
|
|
|
|
respond_to do |format|
|
|
format.html do
|
|
redirect_to namespace_project_project_members_path(@project.namespace, @project)
|
|
end
|
|
format.js { head :ok }
|
|
end
|
|
end
|
|
|
|
def resend_invite
|
|
redirect_path = namespace_project_project_members_path(@project.namespace, @project)
|
|
|
|
@project_member = @project.project_members.find(params[:id])
|
|
|
|
if @project_member.invite?
|
|
@project_member.resend_invite
|
|
|
|
redirect_to redirect_path, notice: 'The invitation was successfully resent.'
|
|
else
|
|
redirect_to redirect_path, alert: 'The invitation has already been accepted.'
|
|
end
|
|
end
|
|
|
|
def apply_import
|
|
source_project = Project.find(params[:source_project_id])
|
|
|
|
if can?(current_user, :read_project_member, source_project)
|
|
status = @project.team.import(source_project, current_user)
|
|
notice = status ? "Successfully imported" : "Import failed"
|
|
else
|
|
return render_404
|
|
end
|
|
|
|
redirect_to(namespace_project_project_members_path(project.namespace, project),
|
|
notice: notice)
|
|
end
|
|
|
|
protected
|
|
|
|
def member_params
|
|
params.require(:project_member).permit(:user_id, :access_level)
|
|
end
|
|
|
|
# MembershipActions concern
|
|
alias_method :membershipable, :project
|
|
end
|