@@ -8,7 +8,7 @@ |
||
8 | 8 | { |
9 | 9 | public $table = 'users'; |
10 | 10 | |
11 | - function init(){ |
|
11 | + function init() { |
|
12 | 12 | parent::init(); |
13 | 13 | |
14 | 14 | $this->addFields(['name']); |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | |
36 | 36 | protected function showEditPermissions() |
37 | 37 | { |
38 | - $permissionsData = Permission::all(['id', 'name'])->map(function($permission){ |
|
38 | + $permissionsData = Permission::all(['id', 'name'])->map(function($permission) { |
|
39 | 39 | $permission['name'] = trans(ucwords($permission['name'])); |
40 | 40 | |
41 | 41 | return $permission; |
@@ -99,19 +99,19 @@ discard block |
||
99 | 99 | |
100 | 100 | protected function columns() |
101 | 101 | { |
102 | - return $this->columns = $this->columns?: $this->add('Columns'); |
|
102 | + return $this->columns = $this->columns ?: $this->add('Columns'); |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | protected function permissionId() |
106 | 106 | { |
107 | - return $this->app->stickyGet($this->columns()->name)?: $this->getModuleVariable('permission'); |
|
107 | + return $this->app->stickyGet($this->columns()->name) ?: $this->getModuleVariable('permission'); |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | protected function reload($permissionExpression = null) |
111 | 111 | { |
112 | 112 | $columns = $this->columns(); |
113 | 113 | |
114 | - return $this->reload = $this->reload?: new jsReload($columns, [$columns->name => $permissionExpression?: '']); |
|
114 | + return $this->reload = $this->reload ?: new jsReload($columns, [$columns->name => $permissionExpression ?: '']); |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | protected function getModel($array) |
@@ -23,10 +23,10 @@ |
||
23 | 23 | { |
24 | 24 | // setup default home pages |
25 | 25 | Database\Models\HomePage::create()->import([ |
26 | - [ |
|
27 | - 'path' => 'view/dashboard', |
|
28 | - 'role' => 'Super Admin' |
|
29 | - ], |
|
26 | + [ |
|
27 | + 'path' => 'view/dashboard', |
|
28 | + 'role' => 'Super Admin' |
|
29 | + ], |
|
30 | 30 | [ |
31 | 31 | 'path' => 'view/dashboard', |
32 | 32 | 'role' => 'Employee' |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | $this->setOrder('priority'); |
44 | 44 | |
45 | 45 | $this->addHook('beforeInsert', function($model, & $data) { |
46 | - $data['priority'] = $data['priority']?: $this->action('fx', ['max', 'priority'])->getOne() + 1; |
|
46 | + $data['priority'] = $data['priority'] ?: $this->action('fx', ['max', 'priority'])->getOne() + 1; |
|
47 | 47 | }); |
48 | 48 | } |
49 | 49 | |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | { |
57 | 57 | static $cache; |
58 | 58 | |
59 | - if (! isset($cache)) { |
|
59 | + if (!isset($cache)) { |
|
60 | 60 | $cache = []; |
61 | 61 | foreach (HomePageJoint::collect() as $joint) { |
62 | 62 | $cache[$joint->link()] = $joint->caption(); |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | */ |
74 | 74 | public static function ofUser() |
75 | 75 | { |
76 | - if (! $user = Auth::user()) return; |
|
76 | + if (!$user = Auth::user()) return; |
|
77 | 77 | |
78 | 78 | return self::addCondition('role', $user->roles()->pluck('name')->toArray())->loadAny(); |
79 | 79 | } |
@@ -85,6 +85,6 @@ discard block |
||
85 | 85 | */ |
86 | 86 | public static function pathOfUser() |
87 | 87 | { |
88 | - return HomePage::ofUser()['path']?: self::$defaultPath; |
|
88 | + return HomePage::ofUser()['path'] ?: self::$defaultPath; |
|
89 | 89 | } |
90 | 90 | } |
@@ -73,7 +73,9 @@ |
||
73 | 73 | */ |
74 | 74 | public static function ofUser() |
75 | 75 | { |
76 | - if (! $user = Auth::user()) return; |
|
76 | + if (! $user = Auth::user()) { |
|
77 | + return; |
|
78 | + } |
|
77 | 79 | |
78 | 80 | return self::addCondition('role', $user->roles()->pluck('name')->toArray())->loadAny(); |
79 | 81 | } |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | |
31 | 31 | $grid->setModel(HomePage::create()); |
32 | 32 | |
33 | - $grid->addDragHandler()->onReorder(function ($order) { |
|
33 | + $grid->addDragHandler()->onReorder(function($order) { |
|
34 | 34 | $result = true; |
35 | 35 | foreach (HomePage::create() as $homepage) { |
36 | 36 | $homepage['priority'] = array_search($homepage['id'], $order); |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | $result &= $homepage->save(); |
39 | 39 | } |
40 | 40 | |
41 | - return $result? $this->notify(__('Homepages reordered!')): $this->notifyError(__('Error saving order!')); |
|
41 | + return $result ? $this->notify(__('Homepages reordered!')) : $this->notifyError(__('Error saving order!')); |
|
42 | 42 | }); |
43 | 43 | } |
44 | 44 | } |