Skip to content
Snippets Groups Projects

Fix deployment approval popup to support multiple approval rules

All threads resolved!
Files
5
@@ -9,7 +9,7 @@ def deployment_approval_data(deployment)
iid: deployment.iid,
id: deployment.id,
required_approval_count: deployment.environment.required_approval_count,
can_approve_deployment: can?(current_user, :update_deployment, deployment).to_s,
can_approve_deployment: can_approve_deployment?(deployment).to_s,
deployable_name: deployment.deployable&.name,
approvals: ::API::Entities::Deployments::Approval.represent(deployment.approvals).to_json,
project_id: deployment.project_id,
@@ -18,8 +18,15 @@ def deployment_approval_data(deployment)
end
def show_deployment_approval?(deployment)
can?(current_user, :update_deployment, deployment) &&
deployment.environment.required_approval_count > 0
can_approve_deployment?(deployment)
end
def can_approve_deployment?(deployment)
if deployment.environment.has_approval_rules?
+1
can?(current_user, :read_deployment, deployment) && deployment.environment.find_approval_rule_for(current_user).present?
else
can?(current_user, :update_deployment, deployment) && deployment.environment.required_approval_count > 0
end
end
end
end
Loading