@@ -8,35 +8,35 @@ |
||
8 | 8 | |
9 | 9 | class GroupsController extends BaseApiController |
10 | 10 | { |
11 | - /** |
|
12 | - * The name of the model that is used by the base api controller |
|
13 | - * to preform actions like (add, edit ... etc). |
|
14 | - * @var string |
|
15 | - */ |
|
16 | - protected $model = 'groups'; |
|
11 | + /** |
|
12 | + * The name of the model that is used by the base api controller |
|
13 | + * to preform actions like (add, edit ... etc). |
|
14 | + * @var string |
|
15 | + */ |
|
16 | + protected $model = 'groups'; |
|
17 | 17 | |
18 | - /** |
|
19 | - * The validations rules used by the base api controller |
|
20 | - * to check before add. |
|
21 | - * @var array |
|
22 | - */ |
|
23 | - protected $validationRules = [ |
|
24 | - 'name' => 'required|string|max:100|unique:groups,name,{id}' |
|
25 | - ]; |
|
18 | + /** |
|
19 | + * The validations rules used by the base api controller |
|
20 | + * to check before add. |
|
21 | + * @var array |
|
22 | + */ |
|
23 | + protected $validationRules = [ |
|
24 | + 'name' => 'required|string|max:100|unique:groups,name,{id}' |
|
25 | + ]; |
|
26 | 26 | |
27 | - /** |
|
28 | - * Handle an assign permissions to group request. |
|
29 | - * |
|
30 | - * @param \Illuminate\Http\Request $request |
|
31 | - * @return \Illuminate\Http\Response |
|
32 | - */ |
|
33 | - public function postAssignpermissions(Request $request) |
|
34 | - { |
|
35 | - $this->validate($request, [ |
|
36 | - 'permission_ids' => 'required|exists:permissions,id', |
|
37 | - 'group_id' => 'required|exists:groups,id' |
|
38 | - ]); |
|
27 | + /** |
|
28 | + * Handle an assign permissions to group request. |
|
29 | + * |
|
30 | + * @param \Illuminate\Http\Request $request |
|
31 | + * @return \Illuminate\Http\Response |
|
32 | + */ |
|
33 | + public function postAssignpermissions(Request $request) |
|
34 | + { |
|
35 | + $this->validate($request, [ |
|
36 | + 'permission_ids' => 'required|exists:permissions,id', |
|
37 | + 'group_id' => 'required|exists:groups,id' |
|
38 | + ]); |
|
39 | 39 | |
40 | - return \Response::json(\Core::groups()->assignPermissions($request->get('group_id'), $request->get('permission_ids')), 200); |
|
41 | - } |
|
40 | + return \Response::json(\Core::groups()->assignPermissions($request->get('group_id'), $request->get('permission_ids')), 200); |
|
41 | + } |
|
42 | 42 | } |
@@ -13,14 +13,14 @@ |
||
13 | 13 | * to preform actions like (add, edit ... etc). |
14 | 14 | * @var string |
15 | 15 | */ |
16 | - protected $model = 'groups'; |
|
16 | + protected $model = 'groups'; |
|
17 | 17 | |
18 | 18 | /** |
19 | 19 | * The validations rules used by the base api controller |
20 | 20 | * to check before add. |
21 | 21 | * @var array |
22 | 22 | */ |
23 | - protected $validationRules = [ |
|
23 | + protected $validationRules = [ |
|
24 | 24 | 'name' => 'required|string|max:100|unique:groups,name,{id}' |
25 | 25 | ]; |
26 | 26 |
@@ -7,104 +7,104 @@ |
||
7 | 7 | |
8 | 8 | class UsersController extends BaseApiController |
9 | 9 | { |
10 | - /** |
|
11 | - * The name of the model that is used by the base api controller |
|
12 | - * to preform actions like (add, edit ... etc). |
|
13 | - * @var string |
|
14 | - */ |
|
15 | - protected $model = 'users'; |
|
10 | + /** |
|
11 | + * The name of the model that is used by the base api controller |
|
12 | + * to preform actions like (add, edit ... etc). |
|
13 | + * @var string |
|
14 | + */ |
|
15 | + protected $model = 'users'; |
|
16 | 16 | |
17 | - /** |
|
18 | - * List of all route actions that the base api controller |
|
19 | - * will skip permissions check for them. |
|
20 | - * @var array |
|
21 | - */ |
|
22 | - protected $skipPermissionCheck = ['account', 'logout']; |
|
17 | + /** |
|
18 | + * List of all route actions that the base api controller |
|
19 | + * will skip permissions check for them. |
|
20 | + * @var array |
|
21 | + */ |
|
22 | + protected $skipPermissionCheck = ['account', 'logout']; |
|
23 | 23 | |
24 | - /** |
|
25 | - * List of all route actions that the base api controller |
|
26 | - * will skip login check for them. |
|
27 | - * @var array |
|
28 | - */ |
|
29 | - protected $skipLoginCheck = ['login', 'register']; |
|
24 | + /** |
|
25 | + * List of all route actions that the base api controller |
|
26 | + * will skip login check for them. |
|
27 | + * @var array |
|
28 | + */ |
|
29 | + protected $skipLoginCheck = ['login', 'register']; |
|
30 | 30 | |
31 | - /** |
|
32 | - * The validations rules used by the base api controller |
|
33 | - * to check before add. |
|
34 | - * @var array |
|
35 | - */ |
|
36 | - protected $validationRules = [ |
|
37 | - 'email' => 'required|email|unique:users,email,{id}', |
|
38 | - 'password' => 'min:6' |
|
39 | - ]; |
|
31 | + /** |
|
32 | + * The validations rules used by the base api controller |
|
33 | + * to check before add. |
|
34 | + * @var array |
|
35 | + */ |
|
36 | + protected $validationRules = [ |
|
37 | + 'email' => 'required|email|unique:users,email,{id}', |
|
38 | + 'password' => 'min:6' |
|
39 | + ]; |
|
40 | 40 | |
41 | - /** |
|
42 | - * Return the logged in user account. |
|
43 | - * |
|
44 | - * @return object |
|
45 | - */ |
|
46 | - public function getAccount() |
|
47 | - { |
|
48 | - $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : []; |
|
49 | - return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\Auth::id(), $relations), 200); |
|
50 | - } |
|
41 | + /** |
|
42 | + * Return the logged in user account. |
|
43 | + * |
|
44 | + * @return object |
|
45 | + */ |
|
46 | + public function getAccount() |
|
47 | + { |
|
48 | + $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : []; |
|
49 | + return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\Auth::id(), $relations), 200); |
|
50 | + } |
|
51 | 51 | |
52 | - /** |
|
53 | - * Logout the user. |
|
54 | - * |
|
55 | - * @return void |
|
56 | - */ |
|
57 | - public function getLogout() |
|
58 | - { |
|
59 | - return \Response::json(\Auth::logout(), 200); |
|
60 | - } |
|
52 | + /** |
|
53 | + * Logout the user. |
|
54 | + * |
|
55 | + * @return void |
|
56 | + */ |
|
57 | + public function getLogout() |
|
58 | + { |
|
59 | + return \Response::json(\Auth::logout(), 200); |
|
60 | + } |
|
61 | 61 | |
62 | - /** |
|
63 | - * Handle a registration request. |
|
64 | - * |
|
65 | - * @param \Illuminate\Http\Request $request |
|
66 | - * @return \Illuminate\Http\Response |
|
67 | - */ |
|
68 | - public function postRegister(Request $request) |
|
69 | - { |
|
70 | - $this->validate($request, ['email' => 'required|email|unique:users,email,{id}','password' => 'required|min:6']); |
|
62 | + /** |
|
63 | + * Handle a registration request. |
|
64 | + * |
|
65 | + * @param \Illuminate\Http\Request $request |
|
66 | + * @return \Illuminate\Http\Response |
|
67 | + */ |
|
68 | + public function postRegister(Request $request) |
|
69 | + { |
|
70 | + $this->validate($request, ['email' => 'required|email|unique:users,email,{id}','password' => 'required|min:6']); |
|
71 | 71 | |
72 | - return \Response::json(\Auth::loginUsingId(\Core::users()->create($request->all())->id), 200); |
|
73 | - } |
|
72 | + return \Response::json(\Auth::loginUsingId(\Core::users()->create($request->all())->id), 200); |
|
73 | + } |
|
74 | 74 | |
75 | - /** |
|
76 | - * Handle a login request to the application. |
|
77 | - * |
|
78 | - * @param \Illuminate\Http\Request $request |
|
79 | - * @return \Illuminate\Http\Response |
|
80 | - */ |
|
81 | - public function postLogin(Request $request) |
|
82 | - { |
|
83 | - if (\Auth::attempt($request->all())) |
|
84 | - { |
|
85 | - $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : []; |
|
86 | - return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\Auth::id(), $relations), 200); |
|
87 | - } |
|
88 | - else |
|
89 | - { |
|
90 | - $error = $this->errorHandler->loginFailed(); |
|
91 | - abort($error['status'], $error['message']); |
|
92 | - } |
|
93 | - } |
|
75 | + /** |
|
76 | + * Handle a login request to the application. |
|
77 | + * |
|
78 | + * @param \Illuminate\Http\Request $request |
|
79 | + * @return \Illuminate\Http\Response |
|
80 | + */ |
|
81 | + public function postLogin(Request $request) |
|
82 | + { |
|
83 | + if (\Auth::attempt($request->all())) |
|
84 | + { |
|
85 | + $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : []; |
|
86 | + return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\Auth::id(), $relations), 200); |
|
87 | + } |
|
88 | + else |
|
89 | + { |
|
90 | + $error = $this->errorHandler->loginFailed(); |
|
91 | + abort($error['status'], $error['message']); |
|
92 | + } |
|
93 | + } |
|
94 | 94 | |
95 | - /** |
|
96 | - * Handle an assign groups to user request. |
|
97 | - * |
|
98 | - * @param \Illuminate\Http\Request $request |
|
99 | - * @return \Illuminate\Http\Response |
|
100 | - */ |
|
101 | - public function postAssigngroups(Request $request) |
|
102 | - { |
|
103 | - $this->validate($request, [ |
|
104 | - 'group_ids' => 'required|exists:groups,id', |
|
105 | - 'user_id' => 'required|exists:users,id' |
|
106 | - ]); |
|
95 | + /** |
|
96 | + * Handle an assign groups to user request. |
|
97 | + * |
|
98 | + * @param \Illuminate\Http\Request $request |
|
99 | + * @return \Illuminate\Http\Response |
|
100 | + */ |
|
101 | + public function postAssigngroups(Request $request) |
|
102 | + { |
|
103 | + $this->validate($request, [ |
|
104 | + 'group_ids' => 'required|exists:groups,id', |
|
105 | + 'user_id' => 'required|exists:users,id' |
|
106 | + ]); |
|
107 | 107 | |
108 | - return \Response::json(\Core::users()->assignGroups($request->get('user_id'), $request->get('group_ids')), 200); |
|
109 | - } |
|
108 | + return \Response::json(\Core::users()->assignGroups($request->get('user_id'), $request->get('group_ids')), 200); |
|
109 | + } |
|
110 | 110 | } |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | * to preform actions like (add, edit ... etc). |
13 | 13 | * @var string |
14 | 14 | */ |
15 | - protected $model = 'users'; |
|
15 | + protected $model = 'users'; |
|
16 | 16 | |
17 | 17 | /** |
18 | 18 | * List of all route actions that the base api controller |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | * to check before add. |
34 | 34 | * @var array |
35 | 35 | */ |
36 | - protected $validationRules = [ |
|
36 | + protected $validationRules = [ |
|
37 | 37 | 'email' => 'required|email|unique:users,email,{id}', |
38 | 38 | 'password' => 'min:6' |
39 | 39 | ]; |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | */ |
68 | 68 | public function postRegister(Request $request) |
69 | 69 | { |
70 | - $this->validate($request, ['email' => 'required|email|unique:users,email,{id}','password' => 'required|min:6']); |
|
70 | + $this->validate($request, ['email' => 'required|email|unique:users,email,{id}', 'password' => 'required|min:6']); |
|
71 | 71 | |
72 | 72 | return \Response::json(\Auth::loginUsingId(\Core::users()->create($request->all())->id), 200); |
73 | 73 | } |
@@ -84,8 +84,7 @@ |
||
84 | 84 | { |
85 | 85 | $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : []; |
86 | 86 | return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\Auth::id(), $relations), 200); |
87 | - } |
|
88 | - else |
|
87 | + } else |
|
89 | 88 | { |
90 | 89 | $error = $this->errorHandler->loginFailed(); |
91 | 90 | abort($error['status'], $error['message']); |
@@ -7,10 +7,10 @@ |
||
7 | 7 | |
8 | 8 | class PermissionsController extends BaseApiController |
9 | 9 | { |
10 | - /** |
|
11 | - * The name of the model that is used by the base api controller |
|
12 | - * to preform actions like (add, edit ... etc). |
|
13 | - * @var string |
|
14 | - */ |
|
15 | - protected $model = 'permissions'; |
|
10 | + /** |
|
11 | + * The name of the model that is used by the base api controller |
|
12 | + * to preform actions like (add, edit ... etc). |
|
13 | + * @var string |
|
14 | + */ |
|
15 | + protected $model = 'permissions'; |
|
16 | 16 | } |
@@ -13,17 +13,17 @@ |
||
13 | 13 | public function up() |
14 | 14 | { |
15 | 15 | Schema::create('users', function (Blueprint $table) { |
16 | - $table->increments('id'); |
|
17 | - $table->string('first_name',100)->nullable(); |
|
18 | - $table->string('last_name',100)->nullable(); |
|
19 | - $table->string('user_name',100)->nullable(); |
|
20 | - $table->text('address')->nullable(); |
|
21 | - $table->string('email')->unique(); |
|
22 | - $table->string('password', 60); |
|
23 | - $table->softDeletes(); |
|
24 | - $table->rememberToken(); |
|
25 | - $table->timestamps(); |
|
26 | - }); |
|
16 | + $table->increments('id'); |
|
17 | + $table->string('first_name',100)->nullable(); |
|
18 | + $table->string('last_name',100)->nullable(); |
|
19 | + $table->string('user_name',100)->nullable(); |
|
20 | + $table->text('address')->nullable(); |
|
21 | + $table->string('email')->unique(); |
|
22 | + $table->string('password', 60); |
|
23 | + $table->softDeletes(); |
|
24 | + $table->rememberToken(); |
|
25 | + $table->timestamps(); |
|
26 | + }); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | /** |
@@ -12,11 +12,11 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('users', function (Blueprint $table) { |
|
15 | + Schema::create('users', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | - $table->string('first_name',100)->nullable(); |
|
18 | - $table->string('last_name',100)->nullable(); |
|
19 | - $table->string('user_name',100)->nullable(); |
|
17 | + $table->string('first_name', 100)->nullable(); |
|
18 | + $table->string('last_name', 100)->nullable(); |
|
19 | + $table->string('user_name', 100)->nullable(); |
|
20 | 20 | $table->text('address')->nullable(); |
21 | 21 | $table->string('email')->unique(); |
22 | 22 | $table->string('password', 60); |
@@ -12,21 +12,21 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('permissions', function (Blueprint $table) { |
|
16 | - $table->increments('id'); |
|
17 | - $table->string('name',100); |
|
18 | - $table->string('model',100); |
|
19 | - $table->softDeletes(); |
|
20 | - $table->timestamps(); |
|
21 | - $table->unique(array('name', 'model')); |
|
22 | - }); |
|
23 | - Schema::create('groups_permissions', function (Blueprint $table) { |
|
24 | - $table->increments('id'); |
|
25 | - $table->integer('group_id'); |
|
26 | - $table->integer('permission_id'); |
|
27 | - $table->softDeletes(); |
|
28 | - $table->timestamps(); |
|
29 | - }); |
|
15 | + Schema::create('permissions', function (Blueprint $table) { |
|
16 | + $table->increments('id'); |
|
17 | + $table->string('name',100); |
|
18 | + $table->string('model',100); |
|
19 | + $table->softDeletes(); |
|
20 | + $table->timestamps(); |
|
21 | + $table->unique(array('name', 'model')); |
|
22 | + }); |
|
23 | + Schema::create('groups_permissions', function (Blueprint $table) { |
|
24 | + $table->increments('id'); |
|
25 | + $table->integer('group_id'); |
|
26 | + $table->integer('permission_id'); |
|
27 | + $table->softDeletes(); |
|
28 | + $table->timestamps(); |
|
29 | + }); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | /** |
@@ -12,15 +12,15 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('permissions', function (Blueprint $table) { |
|
15 | + Schema::create('permissions', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | - $table->string('name',100); |
|
18 | - $table->string('model',100); |
|
17 | + $table->string('name', 100); |
|
18 | + $table->string('model', 100); |
|
19 | 19 | $table->softDeletes(); |
20 | 20 | $table->timestamps(); |
21 | 21 | $table->unique(array('name', 'model')); |
22 | 22 | }); |
23 | - Schema::create('groups_permissions', function (Blueprint $table) { |
|
23 | + Schema::create('groups_permissions', function(Blueprint $table) { |
|
24 | 24 | $table->increments('id'); |
25 | 25 | $table->integer('group_id'); |
26 | 26 | $table->integer('permission_id'); |
@@ -13,19 +13,19 @@ |
||
13 | 13 | public function up() |
14 | 14 | { |
15 | 15 | Schema::create('groups', function (Blueprint $table) { |
16 | - $table->increments('id'); |
|
17 | - $table->string('name',100)->unique(); |
|
18 | - $table->softDeletes(); |
|
19 | - $table->timestamps(); |
|
20 | - }); |
|
16 | + $table->increments('id'); |
|
17 | + $table->string('name',100)->unique(); |
|
18 | + $table->softDeletes(); |
|
19 | + $table->timestamps(); |
|
20 | + }); |
|
21 | 21 | |
22 | - Schema::create('users_groups', function (Blueprint $table) { |
|
23 | - $table->increments('id'); |
|
24 | - $table->integer('user_id'); |
|
25 | - $table->integer('group_id'); |
|
26 | - $table->softDeletes(); |
|
27 | - $table->timestamps(); |
|
28 | - }); |
|
22 | + Schema::create('users_groups', function (Blueprint $table) { |
|
23 | + $table->increments('id'); |
|
24 | + $table->integer('user_id'); |
|
25 | + $table->integer('group_id'); |
|
26 | + $table->softDeletes(); |
|
27 | + $table->timestamps(); |
|
28 | + }); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | /** |
@@ -12,14 +12,14 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('groups', function (Blueprint $table) { |
|
15 | + Schema::create('groups', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | - $table->string('name',100)->unique(); |
|
17 | + $table->string('name', 100)->unique(); |
|
18 | 18 | $table->softDeletes(); |
19 | 19 | $table->timestamps(); |
20 | 20 | }); |
21 | 21 | |
22 | - Schema::create('users_groups', function (Blueprint $table) { |
|
22 | + Schema::create('users_groups', function(Blueprint $table) { |
|
23 | 23 | $table->increments('id'); |
24 | 24 | $table->integer('user_id'); |
25 | 25 | $table->integer('group_id'); |
@@ -5,42 +5,42 @@ |
||
5 | 5 | |
6 | 6 | class AclPermission extends Model { |
7 | 7 | |
8 | - use SoftDeletes; |
|
9 | - protected $table = 'permissions'; |
|
10 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
11 | - protected $hidden = ['deleted_at']; |
|
12 | - protected $guarded = ['id']; |
|
13 | - protected $fillable = ['name', 'model']; |
|
14 | - |
|
15 | - public function getCreatedAtAttribute($value) |
|
16 | - { |
|
17 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
18 | - } |
|
19 | - |
|
20 | - public function getUpdatedAtAttribute($value) |
|
21 | - { |
|
22 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
23 | - } |
|
24 | - |
|
25 | - public function getDeletedAtAttribute($value) |
|
26 | - { |
|
27 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
28 | - } |
|
8 | + use SoftDeletes; |
|
9 | + protected $table = 'permissions'; |
|
10 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
11 | + protected $hidden = ['deleted_at']; |
|
12 | + protected $guarded = ['id']; |
|
13 | + protected $fillable = ['name', 'model']; |
|
14 | + |
|
15 | + public function getCreatedAtAttribute($value) |
|
16 | + { |
|
17 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
18 | + } |
|
19 | + |
|
20 | + public function getUpdatedAtAttribute($value) |
|
21 | + { |
|
22 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
23 | + } |
|
24 | + |
|
25 | + public function getDeletedAtAttribute($value) |
|
26 | + { |
|
27 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
28 | + } |
|
29 | 29 | |
30 | - public function groups() |
|
31 | - { |
|
32 | - return $this->belongsToMany('\App\Modules\Acl\AclGroup','groups_permissions','permission_id','group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
33 | - } |
|
34 | - |
|
35 | - public static function boot() |
|
36 | - { |
|
37 | - parent::boot(); |
|
38 | - |
|
39 | - AclPermission::deleting(function($permission) |
|
40 | - { |
|
41 | - \DB::table('groups_permissions') |
|
42 | - ->where('permission_id', $permission->id) |
|
43 | - ->update(array('deleted_at' => \DB::raw('NOW()'))); |
|
44 | - }); |
|
45 | - } |
|
30 | + public function groups() |
|
31 | + { |
|
32 | + return $this->belongsToMany('\App\Modules\Acl\AclGroup','groups_permissions','permission_id','group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
33 | + } |
|
34 | + |
|
35 | + public static function boot() |
|
36 | + { |
|
37 | + parent::boot(); |
|
38 | + |
|
39 | + AclPermission::deleting(function($permission) |
|
40 | + { |
|
41 | + \DB::table('groups_permissions') |
|
42 | + ->where('permission_id', $permission->id) |
|
43 | + ->update(array('deleted_at' => \DB::raw('NOW()'))); |
|
44 | + }); |
|
45 | + } |
|
46 | 46 | } |
@@ -29,7 +29,7 @@ |
||
29 | 29 | |
30 | 30 | public function groups() |
31 | 31 | { |
32 | - return $this->belongsToMany('\App\Modules\Acl\AclGroup','groups_permissions','permission_id','group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
32 | + return $this->belongsToMany('\App\Modules\Acl\AclGroup', 'groups_permissions', 'permission_id', 'group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | public static function boot() |
@@ -6,74 +6,74 @@ |
||
6 | 6 | |
7 | 7 | class AclUser extends User { |
8 | 8 | |
9 | - use SoftDeletes; |
|
10 | - protected $table = 'users'; |
|
11 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
12 | - protected $hidden = ['password', 'remember_token','deleted_at']; |
|
13 | - protected $guarded = ['id']; |
|
14 | - protected $fillable = ['first_name', 'last_name', 'user_name', 'address', 'email', 'password']; |
|
15 | - protected $appends = ['permissions']; |
|
9 | + use SoftDeletes; |
|
10 | + protected $table = 'users'; |
|
11 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
12 | + protected $hidden = ['password', 'remember_token','deleted_at']; |
|
13 | + protected $guarded = ['id']; |
|
14 | + protected $fillable = ['first_name', 'last_name', 'user_name', 'address', 'email', 'password']; |
|
15 | + protected $appends = ['permissions']; |
|
16 | 16 | |
17 | - public function getCreatedAtAttribute($value) |
|
18 | - { |
|
19 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
20 | - } |
|
17 | + public function getCreatedAtAttribute($value) |
|
18 | + { |
|
19 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
20 | + } |
|
21 | 21 | |
22 | - public function getUpdatedAtAttribute($value) |
|
23 | - { |
|
24 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
25 | - } |
|
22 | + public function getUpdatedAtAttribute($value) |
|
23 | + { |
|
24 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
25 | + } |
|
26 | 26 | |
27 | - public function getDeletedAtAttribute($value) |
|
28 | - { |
|
29 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
30 | - } |
|
27 | + public function getDeletedAtAttribute($value) |
|
28 | + { |
|
29 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
30 | + } |
|
31 | 31 | |
32 | - /** |
|
33 | - * Encrypt the password attribute before |
|
34 | - * saving it in the storage. |
|
35 | - * |
|
36 | - * @param string $value |
|
37 | - */ |
|
38 | - public function setPasswordAttribute($value) |
|
39 | - { |
|
40 | - $this->attributes['password'] = bcrypt($value); |
|
41 | - } |
|
32 | + /** |
|
33 | + * Encrypt the password attribute before |
|
34 | + * saving it in the storage. |
|
35 | + * |
|
36 | + * @param string $value |
|
37 | + */ |
|
38 | + public function setPasswordAttribute($value) |
|
39 | + { |
|
40 | + $this->attributes['password'] = bcrypt($value); |
|
41 | + } |
|
42 | 42 | |
43 | - public function logs() |
|
44 | - { |
|
45 | - return $this->hasMany('App\Modules\Logging\Log', 'user_id'); |
|
46 | - } |
|
43 | + public function logs() |
|
44 | + { |
|
45 | + return $this->hasMany('App\Modules\Logging\Log', 'user_id'); |
|
46 | + } |
|
47 | 47 | |
48 | - public function groups() |
|
49 | - { |
|
50 | - return $this->belongsToMany('\App\Modules\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
51 | - } |
|
48 | + public function groups() |
|
49 | + { |
|
50 | + return $this->belongsToMany('\App\Modules\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
51 | + } |
|
52 | 52 | |
53 | - public function getPermissionsAttribute() |
|
54 | - { |
|
55 | - $permissions = []; |
|
56 | - foreach ($this->groups as $group) |
|
57 | - { |
|
58 | - $group->permissions->each(function ($permission) use (&$permissions){ |
|
59 | - $permissions[$permission->model][$permission->id] = $permission->name; |
|
60 | - }); |
|
61 | - } |
|
53 | + public function getPermissionsAttribute() |
|
54 | + { |
|
55 | + $permissions = []; |
|
56 | + foreach ($this->groups as $group) |
|
57 | + { |
|
58 | + $group->permissions->each(function ($permission) use (&$permissions){ |
|
59 | + $permissions[$permission->model][$permission->id] = $permission->name; |
|
60 | + }); |
|
61 | + } |
|
62 | 62 | |
63 | - return \Illuminate\Database\Eloquent\Collection::make($permissions); |
|
64 | - } |
|
63 | + return \Illuminate\Database\Eloquent\Collection::make($permissions); |
|
64 | + } |
|
65 | 65 | |
66 | - public static function boot() |
|
67 | - { |
|
68 | - parent::boot(); |
|
66 | + public static function boot() |
|
67 | + { |
|
68 | + parent::boot(); |
|
69 | 69 | |
70 | - AclUser::deleting(function($user) |
|
71 | - { |
|
72 | - \DB::table('users_groups') |
|
73 | - ->where('user_id', $user->id) |
|
74 | - ->update(array('deleted_at' => \DB::raw('NOW()'))); |
|
70 | + AclUser::deleting(function($user) |
|
71 | + { |
|
72 | + \DB::table('users_groups') |
|
73 | + ->where('user_id', $user->id) |
|
74 | + ->update(array('deleted_at' => \DB::raw('NOW()'))); |
|
75 | 75 | |
76 | - $user->logs()->delete(); |
|
77 | - }); |
|
78 | - } |
|
76 | + $user->logs()->delete(); |
|
77 | + }); |
|
78 | + } |
|
79 | 79 | } |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | use SoftDeletes; |
10 | 10 | protected $table = 'users'; |
11 | 11 | protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
12 | - protected $hidden = ['password', 'remember_token','deleted_at']; |
|
12 | + protected $hidden = ['password', 'remember_token', 'deleted_at']; |
|
13 | 13 | protected $guarded = ['id']; |
14 | 14 | protected $fillable = ['first_name', 'last_name', 'user_name', 'address', 'email', 'password']; |
15 | 15 | protected $appends = ['permissions']; |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | |
48 | 48 | public function groups() |
49 | 49 | { |
50 | - return $this->belongsToMany('\App\Modules\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
50 | + return $this->belongsToMany('\App\Modules\Acl\AclGroup', 'users_groups', 'user_id', 'group_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | public function getPermissionsAttribute() |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | $permissions = []; |
56 | 56 | foreach ($this->groups as $group) |
57 | 57 | { |
58 | - $group->permissions->each(function ($permission) use (&$permissions){ |
|
58 | + $group->permissions->each(function($permission) use (&$permissions){ |
|
59 | 59 | $permissions[$permission->model][$permission->id] = $permission->name; |
60 | 60 | }); |
61 | 61 | } |
@@ -5,45 +5,45 @@ |
||
5 | 5 | |
6 | 6 | class Settings extends Model{ |
7 | 7 | |
8 | - use SoftDeletes; |
|
9 | - protected $table = 'settings'; |
|
10 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
11 | - protected $hidden = ['deleted_at']; |
|
12 | - protected $guarded = ['id', 'key']; |
|
13 | - protected $fillable = ['name','value']; |
|
8 | + use SoftDeletes; |
|
9 | + protected $table = 'settings'; |
|
10 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
11 | + protected $hidden = ['deleted_at']; |
|
12 | + protected $guarded = ['id', 'key']; |
|
13 | + protected $fillable = ['name','value']; |
|
14 | 14 | |
15 | - public function getCreatedAtAttribute($value) |
|
16 | - { |
|
17 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
18 | - } |
|
19 | - |
|
20 | - public function getUpdatedAtAttribute($value) |
|
21 | - { |
|
22 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
23 | - } |
|
24 | - |
|
25 | - public function getDeletedAtAttribute($value) |
|
26 | - { |
|
27 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
28 | - } |
|
29 | - |
|
30 | - public static function boot() |
|
31 | - { |
|
32 | - parent::boot(); |
|
33 | - |
|
34 | - Settings::creating(function($setting) |
|
35 | - { |
|
36 | - $error = \ErrorHandler::cannotCreateSetting(); |
|
37 | - abort($error['status'], $error['message']); |
|
38 | - }); |
|
39 | - |
|
40 | - Settings::updating(function($setting) |
|
41 | - { |
|
42 | - if ($setting->original['key'] !== $setting->key) |
|
43 | - { |
|
44 | - $error = \ErrorHandler::cannotUpdateSettingKey(); |
|
45 | - abort($error['status'], $error['message']); |
|
46 | - } |
|
47 | - }); |
|
48 | - } |
|
15 | + public function getCreatedAtAttribute($value) |
|
16 | + { |
|
17 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
18 | + } |
|
19 | + |
|
20 | + public function getUpdatedAtAttribute($value) |
|
21 | + { |
|
22 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
23 | + } |
|
24 | + |
|
25 | + public function getDeletedAtAttribute($value) |
|
26 | + { |
|
27 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
28 | + } |
|
29 | + |
|
30 | + public static function boot() |
|
31 | + { |
|
32 | + parent::boot(); |
|
33 | + |
|
34 | + Settings::creating(function($setting) |
|
35 | + { |
|
36 | + $error = \ErrorHandler::cannotCreateSetting(); |
|
37 | + abort($error['status'], $error['message']); |
|
38 | + }); |
|
39 | + |
|
40 | + Settings::updating(function($setting) |
|
41 | + { |
|
42 | + if ($setting->original['key'] !== $setting->key) |
|
43 | + { |
|
44 | + $error = \ErrorHandler::cannotUpdateSettingKey(); |
|
45 | + abort($error['status'], $error['message']); |
|
46 | + } |
|
47 | + }); |
|
48 | + } |
|
49 | 49 | } |
@@ -3,14 +3,14 @@ |
||
3 | 3 | use Illuminate\Database\Eloquent\Model; |
4 | 4 | use Illuminate\Database\Eloquent\SoftDeletes; |
5 | 5 | |
6 | -class Settings extends Model{ |
|
6 | +class Settings extends Model { |
|
7 | 7 | |
8 | 8 | use SoftDeletes; |
9 | 9 | protected $table = 'settings'; |
10 | 10 | protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
11 | 11 | protected $hidden = ['deleted_at']; |
12 | 12 | protected $guarded = ['id', 'key']; |
13 | - protected $fillable = ['name','value']; |
|
13 | + protected $fillable = ['name', 'value']; |
|
14 | 14 | |
15 | 15 | public function getCreatedAtAttribute($value) |
16 | 16 | { |