new correction on access

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
+2 -2
View File
@@ -14,7 +14,7 @@ class CycleController extends Controller
$user = auth('api')->user();
$Cycles = Cycle::
when($user->cant('showAll'), function($query) use ($user) {
when($user->cant('showAll', Cycle::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);
@@ -36,7 +36,7 @@ class CycleController extends Controller
->when($request->has('cycle_number') && $request->cycle_number != '', function($query) use($request){
$query->where('cycle_number', $request->cycle_number);
})
->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);
});