Skip to content

Commit 7de2bd8

Browse files
author
lijianmin
committed
1.fix indentation.2.Delete other lang files
1 parent 7a7e443 commit 7de2bd8

File tree

9 files changed

+108
-142
lines changed

9 files changed

+108
-142
lines changed

‎resources/lang/zh-CN/navigation.php

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎resources/lang/zh-CN/permissions.php

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎resources/lang/zh-CN/resources.php

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎resources/lang/zh-CN/roles.php

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/NovaPermissionServiceProvider.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ class NovaPermissionServiceProvider extends ServiceProvider
1212
public function boot()
1313
{
1414
$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');
1616

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');
2020
}
2121

2222
/**

‎src/Permission.php

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,24 @@ class Permission extends Resource
4141
*/
4242
public static $displayInNavigation = false;
4343

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+
}
5353

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+
}
6363

6464
}

‎src/PermissionResourceTrait.php

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ public function fields(Request $request)
4646
->creationRules('unique:' . config('permission.table_names.permissions'))
4747
->updateRules('unique:' . config('permission.table_names.permissions') . ',name,{{resourceId}}'),
4848

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+
}),
5454

5555
Select::make(__('laravel-nova-permission::permissions.guard_name'), 'guard_name')
5656
->options($guardOptions->toArray())
@@ -66,38 +66,37 @@ public function fields(Request $request)
6666
];
6767
}
6868

69+
/**
70+
* Override the applyFilters method,title field translation
71+
*/
72+
public function title() {
73+
74+
return __('laravel-nova-permission::permissions.display_names.'.$this->name);
75+
}
6976

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-
}
77+
/**
78+
* Rewrite the applySearch method to apply translation field search
79+
*
80+
* @param \Illuminate\Database\Eloquent\Builder $query
81+
* @param string $search
82+
* @return \Illuminate\Database\Eloquent\Builder
83+
*/
84+
protected static function applySearch($query, $search)
85+
{
86+
$trans_search = array_keys(preg_grep("/$search/",array_dot(__('laravel-nova-permission::permissions.display_names'))));
87+
88+
if (is_numeric($search) && in_array($query->getModel()->getKeyType(), ['int', 'integer'])) {
89+
$query->whereKey($search);
90+
}
91+
92+
return $query->where(function ($query) use ($trans_search) {
93+
$model = $query->getModel();
94+
95+
foreach (static::searchableColumns() as $column) {
96+
foreach ($trans_search as $search){
97+
$query->orWhere($model->qualifyColumn($column), 'like', '%'.$search.'%');
98+
}
99+
}
100+
});
101+
}
103102
}

‎src/Role.php

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,23 +41,23 @@ class Role extends Resource
4141
*/
4242
public static $displayInNavigation = false;
4343

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.Roles');
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.Roles');
52+
}
5353

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.Role');
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.Role');
62+
}
6363
}

‎src/TranslationHandelTrait.php

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,35 @@
1313

1414
trait TranslationHandelTrait {
1515

16-
/**
17-
* Override the applyFilters method to add the guard_name condition when filtering
18-
*
19-
* @param \Laravel\Nova\Http\Requests\NovaRequest $request
20-
* @param \Illuminate\Database\Eloquent\Builder $query
21-
* @param array $filters
22-
* @return \Illuminate\Database\Eloquent\Builder
23-
*/
24-
protected static function applyFilters(NovaRequest $request, $query, array $filters)
25-
{
26-
$query = parent::applyFilters($request, $query, $filters);
27-
if($model = head($request->__memoized)){
28-
$guard_name = $model->guard_name ?? self::getGuardForModel(get_class($model));
29-
$query->where('guard_name', $guard_name);
30-
}
31-
32-
return $query;
33-
}
34-
35-
/**
36-
* @param string model
37-
*
38-
* @return string|null
39-
*/
40-
public static function getGuardForModel(string $model) {
41-
42-
return collect(config('auth.guards'))
43-
->map(function ($guard) {
44-
return config("auth.providers.{$guard['provider']}.model");
45-
})->search($model);
46-
}
16+
/**
17+
* Override the applyFilters method to add the guard_name condition when filtering
18+
*
19+
* @param \Laravel\Nova\Http\Requests\NovaRequest $request
20+
* @param \Illuminate\Database\Eloquent\Builder $query
21+
* @param array $filters
22+
*
23+
* @return \Illuminate\Database\Eloquent\Builder
24+
*/
25+
protected static function applyFilters(NovaRequest $request, $query, array $filters) {
26+
$query = parent::applyFilters($request, $query, $filters);
27+
if ($model = head($request->__memoized)) {
28+
$guard_name = $model->guard_name ?? self::getGuardForModel(get_class($model));
29+
$query->where('guard_name', $guard_name);
30+
}
31+
32+
return $query;
33+
}
34+
35+
/**
36+
* @param string model
37+
*
38+
* @return string|null
39+
*/
40+
public static function getGuardForModel(string $model) {
41+
42+
return collect(config('auth.guards'))
43+
->map(function ($guard) {
44+
return config("auth.providers.{$guard['provider']}.model");
45+
})->search($model);
46+
}
4747
}

0 commit comments

Comments
 (0)