@@ -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) |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | $this->setOrder('priority'); |
| 27 | 27 | |
| 28 | 28 | $this->addHook('beforeInsert', function($model, & $data) { |
| 29 | - $data['priority'] = $data['priority']?: $this->action('fx', ['max', 'priority'])->getOne() + 1; |
|
| 29 | + $data['priority'] = $data['priority'] ?: $this->action('fx', ['max', 'priority'])->getOne() + 1; |
|
| 30 | 30 | }); |
| 31 | 31 | |
| 32 | 32 | $this->getAction('edit')->enabled = function($model) { |
@@ -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' |
@@ -86,7 +86,9 @@ |
||
| 86 | 86 | */ |
| 87 | 87 | public static function getUserHomePage() |
| 88 | 88 | { |
| 89 | - if (! $user = Auth::user()) return; |
|
| 89 | + if (! $user = Auth::user()) { |
|
| 90 | + return; |
|
| 91 | + } |
|
| 90 | 92 | |
| 91 | 93 | return HomePage::create()->addCondition('role', $user->roles()->pluck('name')->toArray())->loadAny(); |
| 92 | 94 | } |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | return [['Template', $availablePages[$row[$column]]?? '[' . __('missing: :path', ['path' => $row[$column]]) . ']']]; |
| 49 | 49 | }]); |
| 50 | 50 | |
| 51 | - $this->grid->addDragHandler()->onReorder(function ($order) { |
|
| 51 | + $this->grid->addDragHandler()->onReorder(function($order) { |
|
| 52 | 52 | $result = true; |
| 53 | 53 | foreach (HomePage::create() as $homepage) { |
| 54 | 54 | $homepage['priority'] = array_search($homepage['id'], $order); |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | $result &= $homepage->save(); |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - return $result? $this->notify(__('Homepages reordered!')): $this->notifyError(__('Error saving order!')); |
|
| 59 | + return $result ? $this->notify(__('Homepages reordered!')) : $this->notifyError(__('Error saving order!')); |
|
| 60 | 60 | }); |
| 61 | 61 | } |
| 62 | 62 | |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | { |
| 70 | 70 | static $cache; |
| 71 | 71 | |
| 72 | - if (! isset($cache)) { |
|
| 72 | + if (!isset($cache)) { |
|
| 73 | 73 | $cache = []; |
| 74 | 74 | foreach (HomePageJoint::collect() as $joint) { |
| 75 | 75 | $cache[$joint->link()] = $joint->caption(); |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | */ |
| 87 | 87 | public static function getUserHomePage() |
| 88 | 88 | { |
| 89 | - if (! $user = Auth::user()) return; |
|
| 89 | + if (!$user = Auth::user()) return; |
|
| 90 | 90 | |
| 91 | 91 | return HomePage::create()->addCondition('role', $user->roles()->pluck('name')->toArray())->loadAny(); |
| 92 | 92 | } |
@@ -98,6 +98,6 @@ discard block |
||
| 98 | 98 | */ |
| 99 | 99 | public static function getUserHomePagePath() |
| 100 | 100 | { |
| 101 | - return self::getUserHomePage()['path']?: self::$defaultPath; |
|
| 101 | + return self::getUserHomePage()['path'] ?: self::$defaultPath; |
|
| 102 | 102 | } |
| 103 | 103 | } |