cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-11 17:51:07 +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/CycleController.php
+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);
});
app/Http/Controllers/ItemController.php
+3 -3
View File
@@ -17,7 +17,7 @@ class ItemController extends Controller
return \MessageResponse::error('You dont have access to this section!');
}
$Items = Item::when($user->cant('showAll'), function($query) use ($user) {
$Items = Item::when($user->cant('showAll', Item::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 ItemController extends Controller
->when($request->has('specific') && $request->specific != '', function($query) use($request){
$query->where('specific', $request->specific);
})
->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);
});
@@ -109,7 +109,7 @@ class ItemController extends Controller
return \MessageResponse::data([]);
}
$Items = Item::when($user->cant('showAll'), function($query) use ($user) {
$Items = Item::when($user->cant('showAll', Item::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);
app/Http/Controllers/LabelController.php
+4 -6
View File
@@ -13,13 +13,11 @@ class LabelController extends Controller
public function index(Request $request)
{
$user = auth('api')->user();
$admin_users = User::role('Admin')->get()->pluck('id')->toArray();
$admin_users[] = $user->id;
$Labels = Label::
when($user->cant('showAll'), function($query) use ($user, $admin_users) {
when($user->cant('showAll', Label::class), function($query) use ($user) {
if ($user->hasRole('Supervisor')) {
$query->whereHas('user', function($query) use ($user, $admin_users) {
$query->whereHas('user', function($query) use ($user) {
$query->where('medical_center_id', $user->medical_center_id);
});
}
@@ -39,7 +37,7 @@ class LabelController extends Controller
->when($request->has('label_id') && $request->label_id != '', function($query) use($request){
$query->where('id', $request->label_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);
});
@@ -117,7 +115,7 @@ class LabelController extends Controller
// $admin_users[] = $user->id;
$Labels = Label::
when($user->cant('showAll'), function($query) use ($user) {
when($user->cant('showAll', Label::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);
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);
app/Http/Controllers/TestResultController.php
+1 -1
View File
@@ -41,7 +41,7 @@ class TestResultController extends Controller
if ($user->hasRole('Supervisor|User')) {
$medical_center_id = $user->medical_center_id;
}
elseif($request->has('medicalCenter_id') && $request->medicalCenter_id) {
elseif($request->has('medicalCenter_id') && $request->medicalCenter_id != '' && $request->medicalCenter_id != 'undefined' ) {
$medical_center_id = $request->medicalCenter_id;
} else {
$medical_center_id = null;