admin/GSB-Construction
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Additional Changes
Some checks failed
Tests / PHP 8.3 (push) Has been cancelled
Details
Tests / PHP 8.4 (push) Has been cancelled
Details
Tests / PHP 8.5 (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Christopher Boyles
2026-06-02 22:04:03 +08:00
parent e6a9a80c32
commit 64d4b331a8
151 changed files with 15070 additions and 945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Modules/DocumentManagement/app/Http/Controllers/DocumentController.php
View File

@@ -88,8 +88,11 @@ class DocumentController extends Controller
]);
// Trigger Global Approval Workflow
$approverIds = \App\Models\User::role(['Main Contractor Admin'])->pluck('id')->toArray();
if (empty($approverIds)) {
$approverIds = [];
if (\Spatie\Permission\Models\Role::where('name', 'Main Contractor Admin')->exists()) {
$approverIds = \App\Models\User::role('Main Contractor Admin')->pluck('id')->toArray();
}
if (empty($approverIds) && \Spatie\Permission\Models\Role::where('name', 'Super Admin')->exists()) {
$approverIds = \App\Models\User::role('Super Admin')->pluck('id')->toArray();
}
if (!empty($approverIds)) {
@@ -129,8 +132,11 @@ class DocumentController extends Controller
$document->update(['status' => 'Pending']);
// Trigger Global Approval Workflow for the new version
$approverIds = \App\Models\User::role(['Main Contractor Admin'])->pluck('id')->toArray();
if (empty($approverIds)) {
$approverIds = [];
if (\Spatie\Permission\Models\Role::where('name', 'Main Contractor Admin')->exists()) {
$approverIds = \App\Models\User::role('Main Contractor Admin')->pluck('id')->toArray();
}
if (empty($approverIds) && \Spatie\Permission\Models\Role::where('name', 'Super Admin')->exists()) {
$approverIds = \App\Models\User::role('Super Admin')->pluck('id')->toArray();
}
if (!empty($approverIds)) {
@@ -168,7 +174,7 @@ class DocumentController extends Controller
public function versions(Document $document)
{
$document->load(['versions.uploader:id,name', 'uploader:id,name', 'approvals.approver']);
$document->load(['versions.uploader:id,name', 'uploader:id,name', 'approvals.approver', 'category']);
return Inertia::render('DocumentManagement::Documents/Versions', [
'document' => $document,