|
@@ -43,10 +43,10 @@ class ApprovalController extends Controller
|
|
|
$query = Approval::with(['createdBy']);
|
|
|
|
|
|
match ($request->get("tab")) {
|
|
|
- 'wait_for_me' => $query->allowed(true),
|
|
|
+ 'wait_for_me' => $query->allowed(),
|
|
|
'pr' => $query->where("created_by", Auth::id()),
|
|
|
'my_approval' => $query->where("action_users", 'like', '%,'.Auth::id().',%'),
|
|
|
- default => $query->allowed(),
|
|
|
+ default => $query->allowed(true),
|
|
|
};
|
|
|
|
|
|
$approvals = $query->filter($request->all())->orderByDesc("created_at")->paginate($pageSize);
|
|
@@ -115,6 +115,9 @@ class ApprovalController extends Controller
|
|
|
'approval_logs' => ActionByApprovalLogResource::collection($actions),
|
|
|
'sub_objects' => $subObjects,
|
|
|
'file_copied' => $approval->file_copied,
|
|
|
+ 'copy_file_permission' => $approvalObjectType == ApprovalObjectType::CONTAINER_FILE
|
|
|
+ && $approval->last_action_user_id == Auth::id()
|
|
|
+ && $approval->status == ObjectApprovalStatus::APPROVED->value,
|
|
|
]
|
|
|
]);
|
|
|
}
|
|
@@ -122,7 +125,7 @@ class ApprovalController extends Controller
|
|
|
public function action(ActionRequest $request, string $id, ActionService $actionService)
|
|
|
{
|
|
|
$approval = Approval::query()
|
|
|
- ->allowed(true)
|
|
|
+ ->allowed()
|
|
|
->whereIn("status", [
|
|
|
ObjectApprovalStatus::DOING->value,
|
|
|
])
|