@@ -18,7 +18,7 @@ |
||
18 | 18 | public function authorize() |
19 | 19 | { |
20 | 20 | |
21 | - if($this->HasPermissionTo('destroy-tasks')) return true; |
|
21 | + if ($this->HasPermissionTo('destroy-tasks')) return true; |
|
22 | 22 | if ($this->owns('tasks')) return true; |
23 | 23 | return false; |
24 | 24 |
@@ -18,8 +18,12 @@ |
||
18 | 18 | public function authorize() |
19 | 19 | { |
20 | 20 | |
21 | - if($this->HasPermissionTo('destroy-tasks')) return true; |
|
22 | - if ($this->owns('tasks')) return true; |
|
21 | + if($this->HasPermissionTo('destroy-tasks')) { |
|
22 | + return true; |
|
23 | + } |
|
24 | + if ($this->owns('tasks')) { |
|
25 | + return true; |
|
26 | + } |
|
23 | 27 | return false; |
24 | 28 | |
25 | 29 | //return Auth::user()->HasPermissionTo('destroy-tasks'); |
@@ -49,11 +49,11 @@ |
||
49 | 49 | |
50 | 50 | $role = Role::firstOrCreate(['name' => 'users-manager']); |
51 | 51 | |
52 | - assignPermission($role,'list-users'); |
|
53 | - assignPermission($role,'show-users'); |
|
54 | - assignPermission($role,'store-users'); |
|
55 | - assignPermission($role,'update-users'); |
|
56 | - assignPermission($role,'destroy-users'); |
|
52 | + assignPermission($role,'list-users'); |
|
53 | + assignPermission($role,'show-users'); |
|
54 | + assignPermission($role,'store-users'); |
|
55 | + assignPermission($role,'update-users'); |
|
56 | + assignPermission($role,'destroy-users'); |
|
57 | 57 | |
58 | 58 | } |
59 | 59 | } |
@@ -8,21 +8,21 @@ discard block |
||
8 | 8 | //funció creada per veure si el rol ja te assignat un permís, si el te no fem res, sino li assignem. |
9 | 9 | // si no es fa així provoca error: |
10 | 10 | //Illuminate\Database\QueryException with message 'SQLSTATE[23000]: Integrity constraint violation: 19 UNIQUE constraint failed: role_has_permissions.permission_id, role_has_permissions.role_id (SQL: insert into "role_has_permissions" ("permission_id", "role_id") values (1, 1))' |
11 | -if(!function_exists('assignPermission')){ |
|
11 | +if ( ! function_exists('assignPermission')) { |
|
12 | 12 | |
13 | 13 | /** |
14 | 14 | * @param $role |
15 | 15 | * @param $permission |
16 | 16 | */ |
17 | - function assignPermission($role, $permission){ |
|
17 | + function assignPermission($role, $permission) { |
|
18 | 18 | |
19 | - if(! $role->HasPermissionTo($permission)){ |
|
19 | + if ( ! $role->HasPermissionTo($permission)) { |
|
20 | 20 | $role->HasPermissionTo($permission); |
21 | 21 | } |
22 | 22 | } |
23 | 23 | } |
24 | 24 | |
25 | -if (!function_exists('initialize_task_permissions')) { |
|
25 | +if ( ! function_exists('initialize_task_permissions')) { |
|
26 | 26 | function initialize_task_permissions() |
27 | 27 | { |
28 | 28 | |
@@ -35,11 +35,11 @@ discard block |
||
35 | 35 | |
36 | 36 | $role = Role::firstOrCreate(['name'=>'task-manager']); |
37 | 37 | |
38 | - assignPermission($role,'list-tasks'); |
|
39 | - assignPermission($role,'show-tasks'); |
|
40 | - assignPermission($role,'store-tasks'); |
|
41 | - assignPermission($role,'update-tasks'); |
|
42 | - assignPermission($role,'destroy-tasks'); |
|
38 | + assignPermission($role, 'list-tasks'); |
|
39 | + assignPermission($role, 'show-tasks'); |
|
40 | + assignPermission($role, 'store-tasks'); |
|
41 | + assignPermission($role, 'update-tasks'); |
|
42 | + assignPermission($role, 'destroy-tasks'); |
|
43 | 43 | |
44 | 44 | Permission::firstOrCreate(['name' => 'list-users']); |
45 | 45 | Permission::firstOrCreate(['name' => 'show-users']); |
@@ -49,17 +49,17 @@ discard block |
||
49 | 49 | |
50 | 50 | $role = Role::firstOrCreate(['name' => 'users-manager']); |
51 | 51 | |
52 | - assignPermission($role,'list-users'); |
|
53 | - assignPermission($role,'show-users'); |
|
54 | - assignPermission($role,'store-users'); |
|
55 | - assignPermission($role,'update-users'); |
|
56 | - assignPermission($role,'destroy-users'); |
|
52 | + assignPermission($role, 'list-users'); |
|
53 | + assignPermission($role, 'show-users'); |
|
54 | + assignPermission($role, 'store-users'); |
|
55 | + assignPermission($role, 'update-users'); |
|
56 | + assignPermission($role, 'destroy-users'); |
|
57 | 57 | |
58 | 58 | } |
59 | 59 | } |
60 | 60 | |
61 | 61 | |
62 | -if (!function_exists('create_user')) { |
|
62 | +if ( ! function_exists('create_user')) { |
|
63 | 63 | function create_user() |
64 | 64 | { |
65 | 65 | factory(User::class)->create([ |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | } |
71 | 71 | } |
72 | 72 | |
73 | -if (!function_exists('first_user_as_task_manager')) { |
|
73 | +if ( ! function_exists('first_user_as_task_manager')) { |
|
74 | 74 | function first_user_as_task_manager() |
75 | 75 | { |
76 | 76 | User::all()->first()->assignRole('task-manager'); |