@@ -24,14 +24,14 @@ discard block |
||
24 | 24 | */ |
25 | 25 | public function index() |
26 | 26 | { |
27 | - return Admin::content(function (Content $content) { |
|
27 | + return Admin::content(function(Content $content) { |
|
28 | 28 | $content->header(trans('admin.menu')); |
29 | 29 | $content->description(trans('admin.list')); |
30 | 30 | |
31 | - $content->row(function (Row $row) { |
|
31 | + $content->row(function(Row $row) { |
|
32 | 32 | $row->column(6, $this->treeView()->render()); |
33 | 33 | |
34 | - $row->column(6, function (Column $column) { |
|
34 | + $row->column(6, function(Column $column) { |
|
35 | 35 | $form = new \Encore\Admin\Widgets\Form(); |
36 | 36 | $form->action(admin_base_path('auth/menu')); |
37 | 37 | |
@@ -66,10 +66,10 @@ discard block |
||
66 | 66 | */ |
67 | 67 | protected function treeView() |
68 | 68 | { |
69 | - return Menu::tree(function (Tree $tree) { |
|
69 | + return Menu::tree(function(Tree $tree) { |
|
70 | 70 | $tree->disableCreate(); |
71 | 71 | |
72 | - $tree->branch(function ($branch) { |
|
72 | + $tree->branch(function($branch) { |
|
73 | 73 | $payload = "<i class='fa {$branch['icon']}'></i> <strong>{$branch['title']}</strong>"; |
74 | 74 | |
75 | 75 | if (!isset($branch['children'])) { |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | */ |
93 | 93 | public function edit($id) |
94 | 94 | { |
95 | - return Admin::content(function (Content $content) use ($id) { |
|
95 | + return Admin::content(function(Content $content) use ($id) { |
|
96 | 96 | $content->header(trans('admin.menu')); |
97 | 97 | $content->description(trans('admin.edit')); |
98 | 98 | |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | */ |
108 | 108 | public function form() |
109 | 109 | { |
110 | - return Menu::form(function (Form $form) { |
|
110 | + return Menu::form(function(Form $form) { |
|
111 | 111 | $form->display('id', 'ID'); |
112 | 112 | |
113 | 113 | $form->select('parent_id', trans('admin.parent_id'))->options(Menu::selectOptions()); |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | */ |
23 | 23 | public function index() |
24 | 24 | { |
25 | - return Admin::content(function (Content $content) { |
|
25 | + return Admin::content(function(Content $content) { |
|
26 | 26 | $content->header(trans('admin.administrator')); |
27 | 27 | $content->description(trans('admin.list')); |
28 | 28 | $content->body($this->grid()->render()); |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | */ |
39 | 39 | public function edit($id) |
40 | 40 | { |
41 | - return Admin::content(function (Content $content) use ($id) { |
|
41 | + return Admin::content(function(Content $content) use ($id) { |
|
42 | 42 | $content->header(trans('admin.administrator')); |
43 | 43 | $content->description(trans('admin.edit')); |
44 | 44 | $content->body($this->form()->edit($id)); |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | */ |
53 | 53 | public function create() |
54 | 54 | { |
55 | - return Admin::content(function (Content $content) { |
|
55 | + return Admin::content(function(Content $content) { |
|
56 | 56 | $content->header(trans('admin.administrator')); |
57 | 57 | $content->description(trans('admin.create')); |
58 | 58 | $content->body($this->form()); |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | */ |
67 | 67 | protected function grid() |
68 | 68 | { |
69 | - return Administrator::grid(function (Grid $grid) { |
|
69 | + return Administrator::grid(function(Grid $grid) { |
|
70 | 70 | $grid->id('ID')->sortable(); |
71 | 71 | $grid->username(trans('admin.username')); |
72 | 72 | $grid->name(trans('admin.name')); |
@@ -74,14 +74,14 @@ discard block |
||
74 | 74 | $grid->created_at(trans('admin.created_at')); |
75 | 75 | $grid->updated_at(trans('admin.updated_at')); |
76 | 76 | |
77 | - $grid->actions(function (Grid\Displayers\Actions $actions) { |
|
77 | + $grid->actions(function(Grid\Displayers\Actions $actions) { |
|
78 | 78 | if ($actions->getKey() == 1) { |
79 | 79 | $actions->disableDelete(); |
80 | 80 | } |
81 | 81 | }); |
82 | 82 | |
83 | - $grid->tools(function (Grid\Tools $tools) { |
|
84 | - $tools->batch(function (Grid\Tools\BatchActions $actions) { |
|
83 | + $grid->tools(function(Grid\Tools $tools) { |
|
84 | + $tools->batch(function(Grid\Tools\BatchActions $actions) { |
|
85 | 85 | $actions->disableDelete(); |
86 | 86 | }); |
87 | 87 | }); |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | */ |
96 | 96 | public function form() |
97 | 97 | { |
98 | - return Administrator::form(function (Form $form) { |
|
98 | + return Administrator::form(function(Form $form) { |
|
99 | 99 | $form->display('id', 'ID'); |
100 | 100 | |
101 | 101 | $form->text('username', trans('admin.username'))->rules('required'); |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | $form->image('avatar', trans('admin.avatar')); |
104 | 104 | $form->password('password', trans('admin.password'))->rules('required|confirmed'); |
105 | 105 | $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required') |
106 | - ->default(function ($form) { |
|
106 | + ->default(function($form) { |
|
107 | 107 | return $form->model()->password; |
108 | 108 | }); |
109 | 109 | |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | $form->display('created_at', trans('admin.created_at')); |
116 | 116 | $form->display('updated_at', trans('admin.updated_at')); |
117 | 117 | |
118 | - $form->saving(function (Form $form) { |
|
118 | + $form->saving(function(Form $form) { |
|
119 | 119 | if ($form->password && $form->model()->password != $form->password) { |
120 | 120 | $form->password = bcrypt($form->password); |
121 | 121 | } |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | { |
15 | 15 | $connection = config('admin.database.connection') ?: config('database.default'); |
16 | 16 | |
17 | - Schema::connection($connection)->create(config('admin.database.users_table'), function (Blueprint $table) { |
|
17 | + Schema::connection($connection)->create(config('admin.database.users_table'), function(Blueprint $table) { |
|
18 | 18 | $table->increments('id'); |
19 | 19 | $table->string('username', 190)->unique(); |
20 | 20 | $table->string('password', 60); |
@@ -23,21 +23,21 @@ discard block |
||
23 | 23 | $table->timestamps(); |
24 | 24 | }); |
25 | 25 | |
26 | - Schema::connection($connection)->create(config('admin.database.roles_table'), function (Blueprint $table) { |
|
26 | + Schema::connection($connection)->create(config('admin.database.roles_table'), function(Blueprint $table) { |
|
27 | 27 | $table->increments('id'); |
28 | 28 | $table->string('name', 50)->unique(); |
29 | 29 | $table->string('slug', 50); |
30 | 30 | $table->timestamps(); |
31 | 31 | }); |
32 | 32 | |
33 | - Schema::connection($connection)->create(config('admin.database.permissions_table'), function (Blueprint $table) { |
|
33 | + Schema::connection($connection)->create(config('admin.database.permissions_table'), function(Blueprint $table) { |
|
34 | 34 | $table->increments('id'); |
35 | 35 | $table->string('name', 50)->unique(); |
36 | 36 | $table->string('slug', 50); |
37 | 37 | $table->timestamps(); |
38 | 38 | }); |
39 | 39 | |
40 | - Schema::connection($connection)->create(config('admin.database.menu_table'), function (Blueprint $table) { |
|
40 | + Schema::connection($connection)->create(config('admin.database.menu_table'), function(Blueprint $table) { |
|
41 | 41 | $table->increments('id'); |
42 | 42 | $table->integer('parent_id')->default(0); |
43 | 43 | $table->integer('order')->default(0); |
@@ -48,35 +48,35 @@ discard block |
||
48 | 48 | $table->timestamps(); |
49 | 49 | }); |
50 | 50 | |
51 | - Schema::connection($connection)->create(config('admin.database.role_users_table'), function (Blueprint $table) { |
|
51 | + Schema::connection($connection)->create(config('admin.database.role_users_table'), function(Blueprint $table) { |
|
52 | 52 | $table->integer('role_id'); |
53 | 53 | $table->integer('user_id'); |
54 | 54 | $table->index(['role_id', 'user_id']); |
55 | 55 | $table->timestamps(); |
56 | 56 | }); |
57 | 57 | |
58 | - Schema::connection($connection)->create(config('admin.database.role_permissions_table'), function (Blueprint $table) { |
|
58 | + Schema::connection($connection)->create(config('admin.database.role_permissions_table'), function(Blueprint $table) { |
|
59 | 59 | $table->integer('role_id'); |
60 | 60 | $table->integer('permission_id'); |
61 | 61 | $table->index(['role_id', 'permission_id']); |
62 | 62 | $table->timestamps(); |
63 | 63 | }); |
64 | 64 | |
65 | - Schema::connection($connection)->create(config('admin.database.user_permissions_table'), function (Blueprint $table) { |
|
65 | + Schema::connection($connection)->create(config('admin.database.user_permissions_table'), function(Blueprint $table) { |
|
66 | 66 | $table->integer('user_id'); |
67 | 67 | $table->integer('permission_id'); |
68 | 68 | $table->index(['user_id', 'permission_id']); |
69 | 69 | $table->timestamps(); |
70 | 70 | }); |
71 | 71 | |
72 | - Schema::connection($connection)->create(config('admin.database.role_menu_table'), function (Blueprint $table) { |
|
72 | + Schema::connection($connection)->create(config('admin.database.role_menu_table'), function(Blueprint $table) { |
|
73 | 73 | $table->integer('role_id'); |
74 | 74 | $table->integer('menu_id'); |
75 | 75 | $table->index(['role_id', 'menu_id']); |
76 | 76 | $table->timestamps(); |
77 | 77 | }); |
78 | 78 | |
79 | - Schema::connection($connection)->create(config('admin.database.operation_log_table'), function (Blueprint $table) { |
|
79 | + Schema::connection($connection)->create(config('admin.database.operation_log_table'), function(Blueprint $table) { |
|
80 | 80 | $table->increments('id'); |
81 | 81 | $table->integer('user_id'); |
82 | 82 | $table->string('path'); |
@@ -1,5 +1,5 @@ |
||
1 | 1 | @if($errors->hasBag('exception')) |
2 | - <?php $error = $errors->getBag('exception');?> |
|
2 | + <?php $error = $errors->getBag('exception'); ?> |
|
3 | 3 | <div class="alert alert-warning alert-dismissable"> |
4 | 4 | <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> |
5 | 5 | <h4> |
@@ -1,5 +1,5 @@ |
||
1 | 1 | @if(Session::has('success')) |
2 | - <?php $success = Session::get('success');?> |
|
2 | + <?php $success = Session::get('success'); ?> |
|
3 | 3 | <div class="alert alert-success alert-dismissable"> |
4 | 4 | <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> |
5 | 5 | <h4><i class="icon fa fa-check"></i>{{ array_get($success->get('title'), 0) }}</h4> |
@@ -33,7 +33,7 @@ |
||
33 | 33 | * |
34 | 34 | * @param int $id |
35 | 35 | * |
36 | - * @return \Illuminate\Http\Response |
|
36 | + * @return \Illuminate\Http\JsonResponse |
|
37 | 37 | */ |
38 | 38 | public function destroy($id) |
39 | 39 | { |
@@ -24,7 +24,7 @@ |
||
24 | 24 | protected static function routes($callback) |
25 | 25 | { |
26 | 26 | /* @var \Illuminate\Routing\Router $router */ |
27 | - Route::group(['prefix' => config('admin.route.prefix')], function ($router) use ($callback) { |
|
27 | + Route::group(['prefix' => config('admin.route.prefix')], function($router) use ($callback) { |
|
28 | 28 | $attributes = array_merge([ |
29 | 29 | 'middleware' => config('admin.route.middleware'), |
30 | 30 | ], static::config('route', [])); |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | /** |
56 | 56 | * Get all permissions of user. |
57 | 57 | * |
58 | - * @return mixed |
|
58 | + * @return Collection |
|
59 | 59 | */ |
60 | 60 | public function allPermissions() : Collection |
61 | 61 | { |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | /** |
98 | 98 | * Check if user is administrator. |
99 | 99 | * |
100 | - * @return mixed |
|
100 | + * @return boolean |
|
101 | 101 | */ |
102 | 102 | public function isAdministrator() : bool |
103 | 103 | { |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | * |
110 | 110 | * @param string $role |
111 | 111 | * |
112 | - * @return mixed |
|
112 | + * @return boolean |
|
113 | 113 | */ |
114 | 114 | public function isRole(string $role) : bool |
115 | 115 | { |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | * |
122 | 122 | * @param array $roles |
123 | 123 | * |
124 | - * @return mixed |
|
124 | + * @return boolean |
|
125 | 125 | */ |
126 | 126 | public function inRoles(array $roles = []) : bool |
127 | 127 | { |
@@ -155,7 +155,7 @@ |
||
155 | 155 | { |
156 | 156 | parent::boot(); |
157 | 157 | |
158 | - static::deleting(function ($model) { |
|
158 | + static::deleting(function($model) { |
|
159 | 159 | $model->roles()->detach(); |
160 | 160 | |
161 | 161 | $model->permissions()->detach(); |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | * Get or set option for grid. |
229 | 229 | * |
230 | 230 | * @param string $key |
231 | - * @param mixed $value |
|
231 | + * @param boolean $value |
|
232 | 232 | * |
233 | 233 | * @return $this|mixed |
234 | 234 | */ |
@@ -358,7 +358,7 @@ discard block |
||
358 | 358 | /** |
359 | 359 | * Get the grid paginator. |
360 | 360 | * |
361 | - * @return mixed |
|
361 | + * @return Tools\Paginator |
|
362 | 362 | */ |
363 | 363 | public function paginator() |
364 | 364 | { |
@@ -722,7 +722,7 @@ discard block |
||
722 | 722 | * |
723 | 723 | * @param Closure|null $closure |
724 | 724 | * |
725 | - * @return $this|Tools\Footer |
|
725 | + * @return callable |
|
726 | 726 | */ |
727 | 727 | public function footer(Closure $closure = null) |
728 | 728 | { |
@@ -444,7 +444,7 @@ discard block |
||
444 | 444 | $callback = $this->actionsCallback; |
445 | 445 | $column = $this->addColumn('__actions__', trans('admin.action')); |
446 | 446 | |
447 | - $column->display(function ($value) use ($grid, $column, $callback) { |
|
447 | + $column->display(function($value) use ($grid, $column, $callback) { |
|
448 | 448 | $actions = new Displayers\Actions($value, $grid, $column, $this); |
449 | 449 | |
450 | 450 | return $actions->display($callback); |
@@ -458,7 +458,7 @@ discard block |
||
458 | 458 | */ |
459 | 459 | public function disableRowSelector() |
460 | 460 | { |
461 | - $this->tools(function ($tools) { |
|
461 | + $this->tools(function($tools) { |
|
462 | 462 | /* @var Grid\Tools $tools */ |
463 | 463 | $tools->disableBatchActions(); |
464 | 464 | }); |
@@ -482,7 +482,7 @@ discard block |
||
482 | 482 | $column = new Column(Column::SELECT_COLUMN_NAME, ' '); |
483 | 483 | $column->setGrid($this); |
484 | 484 | |
485 | - $column->display(function ($value) use ($grid, $column) { |
|
485 | + $column->display(function($value) use ($grid, $column) { |
|
486 | 486 | $actions = new Displayers\RowSelector($value, $grid, $column, $this); |
487 | 487 | |
488 | 488 | return $actions->display(); |
@@ -509,7 +509,7 @@ discard block |
||
509 | 509 | |
510 | 510 | Column::setOriginalGridData($data); |
511 | 511 | |
512 | - $this->columns->map(function (Column $column) use (&$data) { |
|
512 | + $this->columns->map(function(Column $column) use (&$data) { |
|
513 | 513 | $data = $column->fill($data); |
514 | 514 | |
515 | 515 | $this->columnNames[] = $column->getName(); |
@@ -601,7 +601,7 @@ discard block |
||
601 | 601 | */ |
602 | 602 | protected function buildRows(array $data) |
603 | 603 | { |
604 | - $this->rows = collect($data)->map(function ($model, $number) { |
|
604 | + $this->rows = collect($data)->map(function($model, $number) { |
|
605 | 605 | return new Row($number, $model); |
606 | 606 | }); |
607 | 607 |