cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-11 09:41:06 +03:30
Code Issues Packages Projects Releases Wiki Activity

new correction on access

Browse Source
This commit is contained in:
Fateme
2020-07-23 19:49:14 +04:30
parent 8a8d00567f
commit 73d0169ca3
14 changed files with 92 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/PackageController.php
+3 -5
View File
@@ -18,7 +18,7 @@ class PackageController extends Controller
}
$Packages = Package::
when($user->cant('showAll'), function($query) use ($user) {
when($user->cant('showAll', Package::class), function($query) use ($user) {
if ($user->hasRole('Supervisor')) {
$query->whereHas('user', function($query) use ($user) {
$query->where('medical_center_id', $user->medical_center_id);
@@ -31,7 +31,7 @@ class PackageController extends Controller
->when($request->has('package_id') && $request->package_id != '', function($query) use($request){
$query->where('id', $request->package_id);
})
->when($request->has('medical_center_id') && $request->medical_center_id != '', function($query) use($request){
->when($request->has('medical_center_id') && $request->medical_center_id != '' && $request->medical_center_id != 'undefined', function($query) use($request){
$query->whereHas('user', function($query) use ($request) {
$query->where('medical_center_id', $request->medical_center_id);
});
@@ -159,11 +159,9 @@ class PackageController extends Controller
public function getPackages()
{
$user = auth('api')->user();
// $admin_users = User::role('Admin')->get()->pluck('id')->toArray();
// $admin_users[] = $user->id;
$Packages = Package::
when($user->cant('showAll'), function($query) use ($user) {
when($user->cant('showAll', Package::class), function($query) use ($user) {
if ($user->hasRole('Supervisor|User')) {
$query->whereHas('user', function($query) use ($user) {
$query->where('medical_center_id', $user->medical_center_id);