mirror of
https://git.meshkee.com/cssd/cssd-back.git
synced 2026-10-11 05:31:04 +03:30
fix policies
This commit is contained in:
@@ -151,9 +151,7 @@ class ItemController extends Controller
|
||||
'user_id' => auth( 'api' )->user()->id ,
|
||||
'creator_id' => auth( 'api' )->user()->id
|
||||
] );
|
||||
|
||||
MediaHelper::moveMediaTo( $Item );
|
||||
|
||||
return MessageResponse::success( trans( 'messages.success' ) );
|
||||
}
|
||||
|
||||
|
||||
@@ -2,16 +2,13 @@
|
||||
|
||||
namespace App\Http\Requests;
|
||||
|
||||
use App\Item;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class StoreItemRequest extends FormRequest
|
||||
{
|
||||
public function authorize()
|
||||
{
|
||||
if ($this->method() == 'POST') {
|
||||
return auth('api')->check() && auth('api')->user()->can('store', Item::class);
|
||||
} else {
|
||||
if ($this->method() != 'POST') {
|
||||
$Item = $this->route('Item');
|
||||
return auth('api')->check() && $Item && auth('api')->user()->can('update', $Item);
|
||||
}
|
||||
|
||||
@@ -2,16 +2,13 @@
|
||||
|
||||
namespace App\Http\Requests;
|
||||
|
||||
use App\Package;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
class StorePackageRequest extends FormRequest
|
||||
{
|
||||
public function authorize()
|
||||
{
|
||||
if ($this->method() == 'POST') {
|
||||
return auth('api')->check() && auth('api')->user()->can('store', Package::class);
|
||||
} else {
|
||||
if ($this->method() != 'POST') {
|
||||
$Package = $this->route('Package');
|
||||
return auth('api')->check() && $Package && auth('api')->user()->can('update', $Package);
|
||||
}
|
||||
@@ -37,7 +34,6 @@ class StorePackageRequest extends FormRequest
|
||||
'items' => 'required',
|
||||
];
|
||||
break;
|
||||
|
||||
}
|
||||
default:
|
||||
break;
|
||||
|
||||
@@ -26,13 +26,11 @@ class ItemPolicy
|
||||
|
||||
public function update( User $User , Item $Item )
|
||||
{
|
||||
if ( $User->hasRole( 'Admin' ) || ( $User->hasRole( 'Supervisor' ) && $Item->user->medical_center_id == $User->medical_center_id ) )
|
||||
return true;
|
||||
}
|
||||
|
||||
public function store( User $User )
|
||||
{
|
||||
if ( $User->hasRole( 'Admin' ) || $User->hasRole( 'Supervisor' ) )
|
||||
if (
|
||||
$User->hasRole( 'Admin' ) ||
|
||||
( $User->hasRole( 'Supervisor' ) && $Item->user->medical_center_id == $User->medical_center_id ) ||
|
||||
$Item->user_id == $User->id
|
||||
)
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,6 @@ namespace App\Policies;
|
||||
|
||||
use App\User;
|
||||
use App\Package;
|
||||
use Doctrine\Tests\Common\Inflector\InflectorTest;
|
||||
|
||||
class PackagePolicy
|
||||
{
|
||||
@@ -22,15 +21,14 @@ class PackagePolicy
|
||||
|
||||
public function update(User $User, Package $Package)
|
||||
{
|
||||
if($User->hasRole('Admin') || ($User->hasRole('Supervisor') && $Package->user->medical_center_id == $User->medical_center_id))
|
||||
if(
|
||||
$User->hasRole('Admin') ||
|
||||
($User->hasRole('Supervisor') && $Package->user->medical_center_id == $User->medical_center_id ) ||
|
||||
$Package->user_id == $User->id
|
||||
)
|
||||
return true;
|
||||
}
|
||||
|
||||
public function store(User $User)
|
||||
{
|
||||
if($User->hasRole('Admin') || $User->hasRole('Supervisor'))
|
||||
return true;
|
||||
}
|
||||
public function verifyPackage(User $User, Package $Package)
|
||||
{
|
||||
if($User->hasRole('Admin') || ($User->hasRole('Supervisor') && $Package->user->medical_center_id == $User->medical_center_id))
|
||||
|
||||
Reference in New Issue
Block a user