@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | protected static function applyFilters(NovaRequest $request, $query, array $filters) |
| 25 | 25 | { |
| 26 | 26 | $query = parent::applyFilters($request, $query, $filters); |
| 27 | - if($model = head($request->__memoized)){ |
|
| 27 | + if ($model = head($request->__memoized)) { |
|
| 28 | 28 | $guard_name = $model->guard_name ?? self::getGuardForModel(get_class($model)); |
| 29 | 29 | $query->where('guard_name', $guard_name); |
| 30 | 30 | } |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | public static function getGuardForModel(string $model) { |
| 41 | 41 | |
| 42 | 42 | return collect(config('auth.guards')) |
| 43 | - ->map(function ($guard) { |
|
| 43 | + ->map(function($guard) { |
|
| 44 | 44 | return config("auth.providers.{$guard['provider']}.model"); |
| 45 | 45 | })->search($model); |
| 46 | 46 | } |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function fields(Request $request) |
| 32 | 32 | { |
| 33 | - $guardOptions = collect(config('auth.guards'))->mapWithKeys(function ($value, $key) { |
|
| 33 | + $guardOptions = collect(config('auth.guards'))->mapWithKeys(function($value, $key) { |
|
| 34 | 34 | return [$key => $key]; |
| 35 | 35 | }); |
| 36 | 36 | |
@@ -46,9 +46,9 @@ discard block |
||
| 46 | 46 | ->creationRules('unique:' . config('permission.table_names.permissions')) |
| 47 | 47 | ->updateRules('unique:' . config('permission.table_names.permissions') . ',name,{{resourceId}}'), |
| 48 | 48 | |
| 49 | - Text::make(__('laravel-nova-permission::permissions.display_name'),function (){ |
|
| 50 | - return __('laravel-nova-permission::permissions.display_names.'.$this->name); |
|
| 51 | - })->canSee(function (){ |
|
| 49 | + Text::make(__('laravel-nova-permission::permissions.display_name'), function() { |
|
| 50 | + return __('laravel-nova-permission::permissions.display_names.' . $this->name); |
|
| 51 | + })->canSee(function() { |
|
| 52 | 52 | return is_array(__('laravel-nova-permission::permissions.display_names')); |
| 53 | 53 | }), |
| 54 | 54 | |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | */ |
| 73 | 73 | public function title() { |
| 74 | 74 | |
| 75 | - return __('laravel-nova-permission::permissions.display_names.'.$this->name); |
|
| 75 | + return __('laravel-nova-permission::permissions.display_names.' . $this->name); |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | /** |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | protected static function applyFilters(NovaRequest $request, $query, array $filters) |
| 87 | 87 | { |
| 88 | 88 | $query = parent::applyFilters($request, $query, $filters); |
| 89 | - if($model = head($request->__memoized)){ |
|
| 89 | + if ($model = head($request->__memoized)) { |
|
| 90 | 90 | $guard_name = $model->guard_name ?? getGuardForModel(get_class($model)); |
| 91 | 91 | $query->where('guard_name', $guard_name); |
| 92 | 92 | } |
@@ -103,18 +103,18 @@ discard block |
||
| 103 | 103 | */ |
| 104 | 104 | protected static function applySearch($query, $search) |
| 105 | 105 | { |
| 106 | - $trans_search = array_keys(preg_grep("/$search/",array_dot(__('laravel-nova-permission::permissions.display_names')))); |
|
| 106 | + $trans_search = array_keys(preg_grep("/$search/", array_dot(__('laravel-nova-permission::permissions.display_names')))); |
|
| 107 | 107 | |
| 108 | 108 | if (is_numeric($search) && in_array($query->getModel()->getKeyType(), ['int', 'integer'])) { |
| 109 | 109 | $query->whereKey($search); |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | - return $query->where(function ($query) use ($trans_search) { |
|
| 112 | + return $query->where(function($query) use ($trans_search) { |
|
| 113 | 113 | $model = $query->getModel(); |
| 114 | 114 | |
| 115 | 115 | foreach (static::searchableColumns() as $column) { |
| 116 | - foreach ($trans_search as $search){ |
|
| 117 | - $query->orWhere($model->qualifyColumn($column), 'like', '%'.$search.'%'); |
|
| 116 | + foreach ($trans_search as $search) { |
|
| 117 | + $query->orWhere($model->qualifyColumn($column), 'like', '%' . $search . '%'); |
|
| 118 | 118 | } |
| 119 | 119 | } |
| 120 | 120 | }); |
@@ -12,10 +12,10 @@ |
||
| 12 | 12 | public function boot() |
| 13 | 13 | { |
| 14 | 14 | $this->loadViewsFrom(__DIR__ . '/../resources/views', 'laravel-nova-permission'); |
| 15 | - $this->loadTranslationsFrom(__DIR__.'/../resources/lang', 'laravel-nova-permission'); |
|
| 15 | + $this->loadTranslationsFrom(__DIR__ . '/../resources/lang', 'laravel-nova-permission'); |
|
| 16 | 16 | |
| 17 | 17 | $this->publishes([ |
| 18 | - __DIR__.'/../resources/lang' => resource_path('lang/vendor/laravel-nova-permission'), |
|
| 18 | + __DIR__ . '/../resources/lang' => resource_path('lang/vendor/laravel-nova-permission'), |
|
| 19 | 19 | ], 'laravel-nova-permission-lang'); |
| 20 | 20 | } |
| 21 | 21 | |
@@ -7,7 +7,7 @@ |
||
| 7 | 7 | |
| 8 | 8 | class Permission extends Resource |
| 9 | 9 | { |
| 10 | - use PermissionResourceTrait,TranslationHandelTrait { |
|
| 10 | + use PermissionResourceTrait, TranslationHandelTrait { |
|
| 11 | 11 | TranslationHandelTrait::applyFilters insteadof PermissionResourceTrait; |
| 12 | 12 | } |
| 13 | 13 | |