@@ -70,7 +70,7 @@ |
||
| 70 | 70 | return ''; |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - return $this->elements[$part]->map(function ($element) { |
|
| 73 | + return $this->elements[$part]->map(function($element) { |
|
| 74 | 74 | if ($element instanceof Htmlable) { |
| 75 | 75 | return $element->toHtml(); |
| 76 | 76 | } |
@@ -76,11 +76,11 @@ discard block |
||
| 76 | 76 | */ |
| 77 | 77 | public function getSetting() |
| 78 | 78 | { |
| 79 | - return Admin::content(function (Content $content) { |
|
| 79 | + return Admin::content(function(Content $content) { |
|
| 80 | 80 | $content->header(trans('admin.user_setting')); |
| 81 | 81 | $form = $this->settingForm(); |
| 82 | 82 | $form->tools( |
| 83 | - function (Form\Tools $tools) { |
|
| 83 | + function(Form\Tools $tools) { |
|
| 84 | 84 | $tools->disableBackButton(); |
| 85 | 85 | $tools->disableListButton(); |
| 86 | 86 | } |
@@ -106,13 +106,13 @@ discard block |
||
| 106 | 106 | */ |
| 107 | 107 | protected function settingForm() |
| 108 | 108 | { |
| 109 | - return Administrator::form(function (Form $form) { |
|
| 109 | + return Administrator::form(function(Form $form) { |
|
| 110 | 110 | $form->display('username', trans('admin.username')); |
| 111 | 111 | $form->text('name', trans('admin.name'))->rules('required'); |
| 112 | 112 | $form->image('avatar', trans('admin.avatar')); |
| 113 | 113 | $form->password('password', trans('admin.password'))->rules('confirmed|required'); |
| 114 | 114 | $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required') |
| 115 | - ->default(function ($form) { |
|
| 115 | + ->default(function($form) { |
|
| 116 | 116 | return $form->model()->password; |
| 117 | 117 | }); |
| 118 | 118 | |
@@ -120,13 +120,13 @@ discard block |
||
| 120 | 120 | |
| 121 | 121 | $form->ignore(['password_confirmation']); |
| 122 | 122 | |
| 123 | - $form->saving(function (Form $form) { |
|
| 123 | + $form->saving(function(Form $form) { |
|
| 124 | 124 | if ($form->password && $form->model()->password != $form->password) { |
| 125 | 125 | $form->password = bcrypt($form->password); |
| 126 | 126 | } |
| 127 | 127 | }); |
| 128 | 128 | |
| 129 | - $form->saved(function () { |
|
| 129 | + $form->saved(function() { |
|
| 130 | 130 | admin_toastr(trans('admin.update_succeeded')); |
| 131 | 131 | |
| 132 | 132 | return redirect(admin_base_path('auth/setting')); |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | * |
| 35 | 35 | * @param Request $request |
| 36 | 36 | * |
| 37 | - * @return mixed |
|
| 37 | + * @return \Illuminate\Http\RedirectResponse |
|
| 38 | 38 | */ |
| 39 | 39 | public function postLogin(Request $request) |
| 40 | 40 | { |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | /** |
| 63 | 63 | * User logout. |
| 64 | 64 | * |
| 65 | - * @return Redirect |
|
| 65 | + * @return \Illuminate\Http\RedirectResponse |
|
| 66 | 66 | */ |
| 67 | 67 | public function getLogout(Request $request) |
| 68 | 68 | { |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | /** |
| 77 | 77 | * User setting page. |
| 78 | 78 | * |
| 79 | - * @return mixed |
|
| 79 | + * @return Content |
|
| 80 | 80 | */ |
| 81 | 81 | public function getSetting() |
| 82 | 82 | { |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | * |
| 168 | 168 | * @param \Illuminate\Http\Request $request |
| 169 | 169 | * |
| 170 | - * @return \Illuminate\Http\Response |
|
| 170 | + * @return \Illuminate\Http\RedirectResponse |
|
| 171 | 171 | */ |
| 172 | 172 | protected function sendLoginResponse(Request $request) |
| 173 | 173 | { |
@@ -235,10 +235,10 @@ |
||
| 235 | 235 | 'middleware' => config('admin.route.middleware'), |
| 236 | 236 | ]; |
| 237 | 237 | |
| 238 | - Route::group($attributes, function ($router) { |
|
| 238 | + Route::group($attributes, function($router) { |
|
| 239 | 239 | |
| 240 | 240 | /* @var \Illuminate\Routing\Router $router */ |
| 241 | - $router->group([], function ($router) { |
|
| 241 | + $router->group([], function($router) { |
|
| 242 | 242 | |
| 243 | 243 | /* @var \Illuminate\Routing\Router $router */ |
| 244 | 244 | $router->resource('auth/users', 'UserController'); |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | * |
| 39 | 39 | * @param array|callable|string $options |
| 40 | 40 | * |
| 41 | - * @return $this|mixed |
|
| 41 | + * @return Select |
|
| 42 | 42 | */ |
| 43 | 43 | public function options($options = []) |
| 44 | 44 | { |
@@ -1,12 +1,12 @@ |
||
| 1 | 1 | @if(Session::has('error')) |
| 2 | - <?php $error = Session::get('error');?> |
|
| 2 | + <?php $error = Session::get('error'); ?> |
|
| 3 | 3 | <div class="alert alert-danger alert-dismissable"> |
| 4 | 4 | <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> |
| 5 | 5 | <h4><i class="icon fa fa-ban"></i>{{ array_get($error->get('title'), 0) }}</h4> |
| 6 | 6 | <p>{!! array_get($error->get('message'), 0) !!}</p> |
| 7 | 7 | </div> |
| 8 | 8 | @elseif (Session::has('errors')) |
| 9 | - <?php $errors = Session::get('errors');?> |
|
| 9 | + <?php $errors = Session::get('errors'); ?> |
|
| 10 | 10 | @if ($errors->hasBag('error')) |
| 11 | 11 | <div class="alert alert-danger alert-dismissable"> |
| 12 | 12 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | return $next($request); |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | - if (!Admin::user()->allPermissions()->first(function ($permission) use ($request) { |
|
| 36 | + if (!Admin::user()->allPermissions()->first(function($permission) use ($request) { |
|
| 37 | 37 | return $permission->shouldPassThrough($request); |
| 38 | 38 | })) { |
| 39 | 39 | Checker::error(); |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | */ |
| 53 | 53 | public function checkRoutePermission(Request $request) |
| 54 | 54 | { |
| 55 | - if (!$middleware = collect($request->route()->middleware())->first(function ($middleware) { |
|
| 55 | + if (!$middleware = collect($request->route()->middleware())->first(function($middleware) { |
|
| 56 | 56 | return Str::startsWith($middleware, $this->middlewarePrefix); |
| 57 | 57 | })) { |
| 58 | 58 | return false; |
@@ -86,7 +86,7 @@ |
||
| 86 | 86 | { |
| 87 | 87 | parent::boot(); |
| 88 | 88 | |
| 89 | - static::deleting(function ($model) { |
|
| 89 | + static::deleting(function($model) { |
|
| 90 | 90 | $model->administrators()->detach(); |
| 91 | 91 | |
| 92 | 92 | $model->permissions()->detach(); |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | |
| 67 | 67 | $method = $this->http_method; |
| 68 | 68 | |
| 69 | - $matches = array_map(function ($path) use ($method) { |
|
| 69 | + $matches = array_map(function($path) use ($method) { |
|
| 70 | 70 | $path = trim(config('admin.route.prefix'), '/').$path; |
| 71 | 71 | |
| 72 | 72 | if (Str::contains($path, ':')) { |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | return false; |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | - $method = collect($match['method'])->filter()->map(function ($method) { |
|
| 103 | + $method = collect($match['method'])->filter()->map(function($method) { |
|
| 104 | 104 | return strtoupper($method); |
| 105 | 105 | }); |
| 106 | 106 | |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | { |
| 141 | 141 | parent::boot(); |
| 142 | 142 | |
| 143 | - static::deleting(function ($model) { |
|
| 143 | + static::deleting(function($model) { |
|
| 144 | 144 | $model->roles()->detach(); |
| 145 | 145 | }); |
| 146 | 146 | } |
@@ -78,7 +78,7 @@ |
||
| 78 | 78 | { |
| 79 | 79 | static::treeBoot(); |
| 80 | 80 | |
| 81 | - static::deleting(function ($model) { |
|
| 81 | + static::deleting(function($model) { |
|
| 82 | 82 | $model->roles()->detach(); |
| 83 | 83 | }); |
| 84 | 84 | } |