diff --git a/Updated_Cms/app/Helpers/helper.php b/Updated_Cms/app/Helpers/helper.php index 0674e7fd89..8b32ee4ce5 100644 --- a/Updated_Cms/app/Helpers/helper.php +++ b/Updated_Cms/app/Helpers/helper.php @@ -33,16 +33,18 @@ if (! function_exists('isDarkColor')) { } if (! function_exists('hasPermission')) { - function hasPermission(string $permission): string + function hasPermission(string $permission): bool { - return app(PermissionsService::class)->getOrDefault($permission); + $value = app(PermissionsService::class)->getOrDefault($permission); + return $value === true || $value === 1 || $value === '1'; } } if (! function_exists('hasHousekeepingPermission')) { - function hasHousekeepingPermission(string $permission): string + function hasHousekeepingPermission(string $permission): bool { - return app(HousekeepingPermissionsService::class)->getOrDefault($permission); + $value = app(HousekeepingPermissionsService::class)->getOrDefault($permission); + return $value === true || $value === 1 || $value === '1'; } } diff --git a/Updated_Cms/app/Policies/WebsiteArticlePolicy.php b/Updated_Cms/app/Policies/WebsiteArticlePolicy.php index 7b7d8edbce..e49d5b530c 100644 --- a/Updated_Cms/app/Policies/WebsiteArticlePolicy.php +++ b/Updated_Cms/app/Policies/WebsiteArticlePolicy.php @@ -9,27 +9,27 @@ class WebsiteArticlePolicy { use HandlesAuthorization; - public function viewAny(User $user) + public function viewAny(User $user): bool { return hasHousekeepingPermission('write_article'); } - public function view(User $user) + public function view(User $user): bool { return hasHousekeepingPermission('write_article'); } - public function create(User $user) + public function create(User $user): bool { return hasHousekeepingPermission('write_article'); } - public function update(User $user) + public function update(User $user): bool { return hasHousekeepingPermission('edit_article'); } - public function delete(User $user) + public function delete(User $user): bool { return hasHousekeepingPermission('delete_article'); }