diff --git a/app/Http/Controllers/Care/CareUnitController.php b/app/Http/Controllers/Care/CareUnitController.php
index 5d16cf0..5bcef28 100644
--- a/app/Http/Controllers/Care/CareUnitController.php
+++ b/app/Http/Controllers/Care/CareUnitController.php
@@ -20,9 +20,11 @@ class CareUnitController extends Controller
public function index(Request $request): View
{
- $this->authorizeCareUnitView($request);
+ $this->authorizeAbility($request, 'admin.departments.view');
$organization = $this->organization($request);
$owner = $this->ownerRef($request);
+ $member = $this->member($request);
+ $permissions = app(CarePermissions::class);
$units = CareUnit::owned($owner)
->where('organization_id', $organization->id)
@@ -43,6 +45,7 @@ class CareUnitController extends Controller
'organization' => $organization,
'kinds' => config('care.care_unit_kinds'),
'heroStats' => $heroStats,
+ 'canManage' => $permissions->can($member, 'admin.departments.manage'),
]);
}
diff --git a/app/Http/Controllers/Care/DepartmentController.php b/app/Http/Controllers/Care/DepartmentController.php
index 0409961..a6eafc6 100644
--- a/app/Http/Controllers/Care/DepartmentController.php
+++ b/app/Http/Controllers/Care/DepartmentController.php
@@ -7,6 +7,7 @@ use App\Http\Controllers\Care\Concerns\ScopesToAccount;
use App\Models\Branch;
use App\Models\Department;
use App\Services\Care\AuditLogger;
+use App\Services\Care\CarePermissions;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\View\View;
@@ -20,6 +21,8 @@ class DepartmentController extends Controller
$this->authorizeAbility($request, 'admin.departments.view');
$organization = $this->organization($request);
$owner = $this->ownerRef($request);
+ $member = $this->member($request);
+ $permissions = app(CarePermissions::class);
$departments = Department::owned($owner)
->whereHas('branch', fn ($q) => $q->where('organization_id', $organization->id))
@@ -38,6 +41,7 @@ class DepartmentController extends Controller
'organization' => $organization,
'types' => config('care.department_types'),
'heroStats' => $heroStats,
+ 'canManage' => $permissions->can($member, 'admin.departments.manage'),
]);
}
diff --git a/resources/views/care/admin/care-units/index.blade.php b/resources/views/care/admin/care-units/index.blade.php
index 6bff097..5dedc10 100644
--- a/resources/views/care/admin/care-units/index.blade.php
+++ b/resources/views/care/admin/care-units/index.blade.php
@@ -11,7 +11,9 @@
['value' => number_format($heroStats['active']), 'label' => 'Active'],
]">
No care units yet — create units under Care units.
+No care units yet — ask an administrator to set them up.
@endforelse diff --git a/resources/views/partials/sidebar.blade.php b/resources/views/partials/sidebar.blade.php index 75b2d7a..7b8bf8c 100644 --- a/resources/views/partials/sidebar.blade.php +++ b/resources/views/partials/sidebar.blade.php @@ -132,9 +132,6 @@ if ($permissions->can($member, 'admin.departments.view')) { $adminNav[] = ['name' => 'Care units', 'route' => route('care.care-units.index'), 'active' => request()->routeIs('care.care-units.*'), 'icon' => '