@@ -12,11 +12,11 @@ |
||
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 | - $this->publishes([ |
|
18 | - __DIR__.'/../resources/lang' => resource_path('lang/vendor/laravel-nova-permission'), |
|
19 | - ], 'laravel-nova-permission-lang'); |
|
17 | + $this->publishes([ |
|
18 | + __DIR__.'/../resources/lang' => resource_path('lang/vendor/laravel-nova-permission'), |
|
19 | + ], 'laravel-nova-permission-lang'); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | /** |
@@ -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 |
@@ -8,8 +8,8 @@ discard block |
||
8 | 8 | class Permission extends Resource |
9 | 9 | { |
10 | 10 | use PermissionResourceTrait,TranslationHandelTrait { |
11 | - TranslationHandelTrait::applyFilters insteadof PermissionResourceTrait; |
|
12 | - } |
|
11 | + TranslationHandelTrait::applyFilters insteadof PermissionResourceTrait; |
|
12 | + } |
|
13 | 13 | |
14 | 14 | /** |
15 | 15 | * The model the resource corresponds to. |
@@ -41,24 +41,24 @@ discard block |
||
41 | 41 | */ |
42 | 42 | public static $displayInNavigation = false; |
43 | 43 | |
44 | - /** |
|
45 | - * Get the displayable label of the resource. |
|
46 | - * |
|
47 | - * @return string |
|
48 | - */ |
|
49 | - public static function label() |
|
50 | - { |
|
51 | - return __('laravel-nova-permission::resources.Permissions'); |
|
52 | - } |
|
44 | + /** |
|
45 | + * Get the displayable label of the resource. |
|
46 | + * |
|
47 | + * @return string |
|
48 | + */ |
|
49 | + public static function label() |
|
50 | + { |
|
51 | + return __('laravel-nova-permission::resources.Permissions'); |
|
52 | + } |
|
53 | 53 | |
54 | - /** |
|
55 | - * Get the displayable singular label of the resource. |
|
56 | - * |
|
57 | - * @return string |
|
58 | - */ |
|
59 | - public static function singularLabel() |
|
60 | - { |
|
61 | - return __('laravel-nova-permission::resources.Permission'); |
|
62 | - } |
|
54 | + /** |
|
55 | + * Get the displayable singular label of the resource. |
|
56 | + * |
|
57 | + * @return string |
|
58 | + */ |
|
59 | + public static function singularLabel() |
|
60 | + { |
|
61 | + return __('laravel-nova-permission::resources.Permission'); |
|
62 | + } |
|
63 | 63 | |
64 | 64 | } |
@@ -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 |
@@ -46,11 +46,11 @@ 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 (){ |
|
52 | - return is_array(__('laravel-nova-permission::permissions.display_names')); |
|
53 | - }), |
|
49 | + Text::make(__('laravel-nova-permission::permissions.display_name'),function (){ |
|
50 | + return __('laravel-nova-permission::permissions.display_names.'.$this->name); |
|
51 | + })->canSee(function (){ |
|
52 | + return is_array(__('laravel-nova-permission::permissions.display_names')); |
|
53 | + }), |
|
54 | 54 | |
55 | 55 | Select::make(__('laravel-nova-permission::permissions.guard_name'), 'guard_name') |
56 | 56 | ->options($guardOptions->toArray()) |
@@ -67,37 +67,37 @@ discard block |
||
67 | 67 | } |
68 | 68 | |
69 | 69 | |
70 | - /** |
|
71 | - * Override the applyFilters method,title field translation |
|
72 | - */ |
|
73 | - public function title() { |
|
74 | - |
|
75 | - return __('laravel-nova-permission::permissions.display_names.'.$this->name); |
|
76 | - } |
|
77 | - |
|
78 | - /** |
|
79 | - * Rewrite the applySearch method to apply translation field search |
|
80 | - * |
|
81 | - * @param \Illuminate\Database\Eloquent\Builder $query |
|
82 | - * @param string $search |
|
83 | - * @return \Illuminate\Database\Eloquent\Builder |
|
84 | - */ |
|
85 | - protected static function applySearch($query, $search) |
|
86 | - { |
|
87 | - $trans_search = array_keys(preg_grep("/$search/",array_dot(__('laravel-nova-permission::permissions.display_names')))); |
|
88 | - |
|
89 | - if (is_numeric($search) && in_array($query->getModel()->getKeyType(), ['int', 'integer'])) { |
|
90 | - $query->whereKey($search); |
|
91 | - } |
|
92 | - |
|
93 | - return $query->where(function ($query) use ($trans_search) { |
|
94 | - $model = $query->getModel(); |
|
95 | - |
|
96 | - foreach (static::searchableColumns() as $column) { |
|
97 | - foreach ($trans_search as $search){ |
|
98 | - $query->orWhere($model->qualifyColumn($column), 'like', '%'.$search.'%'); |
|
99 | - } |
|
100 | - } |
|
101 | - }); |
|
102 | - } |
|
70 | + /** |
|
71 | + * Override the applyFilters method,title field translation |
|
72 | + */ |
|
73 | + public function title() { |
|
74 | + |
|
75 | + return __('laravel-nova-permission::permissions.display_names.'.$this->name); |
|
76 | + } |
|
77 | + |
|
78 | + /** |
|
79 | + * Rewrite the applySearch method to apply translation field search |
|
80 | + * |
|
81 | + * @param \Illuminate\Database\Eloquent\Builder $query |
|
82 | + * @param string $search |
|
83 | + * @return \Illuminate\Database\Eloquent\Builder |
|
84 | + */ |
|
85 | + protected static function applySearch($query, $search) |
|
86 | + { |
|
87 | + $trans_search = array_keys(preg_grep("/$search/",array_dot(__('laravel-nova-permission::permissions.display_names')))); |
|
88 | + |
|
89 | + if (is_numeric($search) && in_array($query->getModel()->getKeyType(), ['int', 'integer'])) { |
|
90 | + $query->whereKey($search); |
|
91 | + } |
|
92 | + |
|
93 | + return $query->where(function ($query) use ($trans_search) { |
|
94 | + $model = $query->getModel(); |
|
95 | + |
|
96 | + foreach (static::searchableColumns() as $column) { |
|
97 | + foreach ($trans_search as $search){ |
|
98 | + $query->orWhere($model->qualifyColumn($column), 'like', '%'.$search.'%'); |
|
99 | + } |
|
100 | + } |
|
101 | + }); |
|
102 | + } |
|
103 | 103 | } |
@@ -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 | /** |
@@ -84,18 +84,18 @@ discard block |
||
84 | 84 | */ |
85 | 85 | protected static function applySearch($query, $search) |
86 | 86 | { |
87 | - $trans_search = array_keys(preg_grep("/$search/",array_dot(__('laravel-nova-permission::permissions.display_names')))); |
|
87 | + $trans_search = array_keys(preg_grep("/$search/", array_dot(__('laravel-nova-permission::permissions.display_names')))); |
|
88 | 88 | |
89 | 89 | if (is_numeric($search) && in_array($query->getModel()->getKeyType(), ['int', 'integer'])) { |
90 | 90 | $query->whereKey($search); |
91 | 91 | } |
92 | 92 | |
93 | - return $query->where(function ($query) use ($trans_search) { |
|
93 | + return $query->where(function($query) use ($trans_search) { |
|
94 | 94 | $model = $query->getModel(); |
95 | 95 | |
96 | 96 | foreach (static::searchableColumns() as $column) { |
97 | - foreach ($trans_search as $search){ |
|
98 | - $query->orWhere($model->qualifyColumn($column), 'like', '%'.$search.'%'); |
|
97 | + foreach ($trans_search as $search) { |
|
98 | + $query->orWhere($model->qualifyColumn($column), 'like', '%' . $search . '%'); |
|
99 | 99 | } |
100 | 100 | } |
101 | 101 | }); |