@@ -371,7 +371,7 @@ discard block |
||
371 | 371 | |
372 | 372 | array_push($visible, '__row_selector__', '__actions__'); |
373 | 373 | |
374 | - return $this->columns->filter(function (Column $column) use ($visible) { |
|
374 | + return $this->columns->filter(function(Column $column) use ($visible) { |
|
375 | 375 | return in_array($column->getName(), $visible); |
376 | 376 | }); |
377 | 377 | } |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | |
392 | 392 | array_push($visible, '__row_selector__', '__actions__'); |
393 | 393 | |
394 | - return collect($this->columnNames)->filter(function ($column) use ($visible) { |
|
394 | + return collect($this->columnNames)->filter(function($column) use ($visible) { |
|
395 | 395 | return in_array($column, $visible); |
396 | 396 | }); |
397 | 397 | } |
@@ -409,7 +409,7 @@ discard block |
||
409 | 409 | $column = new Column($column, $label); |
410 | 410 | $column->setGrid($this); |
411 | 411 | |
412 | - return tap($column, function ($value) { |
|
412 | + return tap($column, function($value) { |
|
413 | 413 | $this->columns->push($value); |
414 | 414 | }); |
415 | 415 | } |
@@ -427,7 +427,7 @@ discard block |
||
427 | 427 | $column = new Column($column, $label); |
428 | 428 | $column->setGrid($this); |
429 | 429 | |
430 | - return tap($column, function ($value) { |
|
430 | + return tap($column, function($value) { |
|
431 | 431 | $this->columns->prepend($value); |
432 | 432 | }); |
433 | 433 | } |
@@ -584,7 +584,7 @@ discard block |
||
584 | 584 | |
585 | 585 | Column::setOriginalGridModels($collection); |
586 | 586 | |
587 | - $this->columns->map(function (Column $column) use (&$data) { |
|
587 | + $this->columns->map(function(Column $column) use (&$data) { |
|
588 | 588 | $data = $column->fill($data); |
589 | 589 | |
590 | 590 | $this->columnNames[] = $column->getName(); |
@@ -688,7 +688,7 @@ discard block |
||
688 | 688 | */ |
689 | 689 | protected function buildRows(array $data) |
690 | 690 | { |
691 | - $this->rows = collect($data)->map(function ($model, $number) { |
|
691 | + $this->rows = collect($data)->map(function($model, $number) { |
|
692 | 692 | return new Row($number, $model); |
693 | 693 | }); |
694 | 694 |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | * Get or set option for grid. |
277 | 277 | * |
278 | 278 | * @param string $key |
279 | - * @param mixed $value |
|
279 | + * @param boolean $value |
|
280 | 280 | * |
281 | 281 | * @return $this|mixed |
282 | 282 | */ |
@@ -466,7 +466,7 @@ discard block |
||
466 | 466 | /** |
467 | 467 | * Get the grid paginator. |
468 | 468 | * |
469 | - * @return mixed |
|
469 | + * @return Tools\Paginator |
|
470 | 470 | */ |
471 | 471 | public function paginator() |
472 | 472 | { |
@@ -518,7 +518,7 @@ discard block |
||
518 | 518 | /** |
519 | 519 | * Set grid action callback. |
520 | 520 | * |
521 | - * @param Closure|string $actions |
|
521 | + * @param Closure $actions |
|
522 | 522 | * |
523 | 523 | * @return $this |
524 | 524 | */ |
@@ -645,7 +645,7 @@ discard block |
||
645 | 645 | * |
646 | 646 | * @param bool $toArray |
647 | 647 | * |
648 | - * @return array|Collection|mixed |
|
648 | + * @return Collection |
|
649 | 649 | */ |
650 | 650 | public function processFilter($toArray = true) |
651 | 651 | { |
@@ -895,7 +895,7 @@ discard block |
||
895 | 895 | * |
896 | 896 | * @param Closure|null $closure |
897 | 897 | * |
898 | - * @return $this|Closure |
|
898 | + * @return callable |
|
899 | 899 | */ |
900 | 900 | public function header(Closure $closure = null) |
901 | 901 | { |
@@ -927,7 +927,7 @@ discard block |
||
927 | 927 | * |
928 | 928 | * @param Closure|null $closure |
929 | 929 | * |
930 | - * @return $this|Closure |
|
930 | + * @return callable |
|
931 | 931 | */ |
932 | 932 | public function footer(Closure $closure = null) |
933 | 933 | { |
@@ -1,5 +1,5 @@ |
||
1 | 1 | @if($errors->hasBag('exception') && config('app.debug') == true) |
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> |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | */ |
86 | 86 | public function disableFilterButton(bool $disable = true) |
87 | 87 | { |
88 | - $this->tools = $this->tools->map(function ($tool) use ($disable) { |
|
88 | + $this->tools = $this->tools->map(function($tool) use ($disable) { |
|
89 | 89 | if ($tool instanceof FilterButton) { |
90 | 90 | return $tool->disable($disable); |
91 | 91 | } |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | */ |
102 | 102 | public function disableRefreshButton(bool $disable = true) |
103 | 103 | { |
104 | - $this->tools = $this->tools->map(function (AbstractTool $tool) use ($disable) { |
|
104 | + $this->tools = $this->tools->map(function(AbstractTool $tool) use ($disable) { |
|
105 | 105 | if ($tool instanceof RefreshButton) { |
106 | 106 | return $tool->disable($disable); |
107 | 107 | } |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | */ |
118 | 118 | public function disableBatchActions(bool $disable = true) |
119 | 119 | { |
120 | - $this->tools = $this->tools->map(function ($tool) use ($disable) { |
|
120 | + $this->tools = $this->tools->map(function($tool) use ($disable) { |
|
121 | 121 | if ($tool instanceof BatchActions) { |
122 | 122 | return $tool->disable($disable); |
123 | 123 | } |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | */ |
132 | 132 | public function batch(\Closure $closure) |
133 | 133 | { |
134 | - call_user_func($closure, $this->tools->first(function ($tool) { |
|
134 | + call_user_func($closure, $this->tools->first(function($tool) { |
|
135 | 135 | return $tool instanceof BatchActions; |
136 | 136 | })); |
137 | 137 | } |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | */ |
144 | 144 | public function render() |
145 | 145 | { |
146 | - return $this->tools->map(function ($tool) { |
|
146 | + return $this->tools->map(function($tool) { |
|
147 | 147 | if ($tool instanceof AbstractTool) { |
148 | 148 | if (!$tool->allowed()) { |
149 | 149 | return ''; |
@@ -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; |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | |
88 | 88 | return collect($excepts) |
89 | 89 | ->map('admin_base_path') |
90 | - ->contains(function ($except) use ($request) { |
|
90 | + ->contains(function($except) use ($request) { |
|
91 | 91 | if ($except !== '/') { |
92 | 92 | $except = trim($except, '/'); |
93 | 93 | } |
@@ -43,7 +43,7 @@ |
||
43 | 43 | |
44 | 44 | return collect($excepts) |
45 | 45 | ->map('admin_base_path') |
46 | - ->contains(function ($except) use ($request) { |
|
46 | + ->contains(function($except) use ($request) { |
|
47 | 47 | if ($except !== '/') { |
48 | 48 | $except = trim($except, '/'); |
49 | 49 | } |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | */ |
22 | 22 | public function up() |
23 | 23 | { |
24 | - Schema::create(config('admin.database.users_table'), function (Blueprint $table) { |
|
24 | + Schema::create(config('admin.database.users_table'), function(Blueprint $table) { |
|
25 | 25 | $table->increments('id'); |
26 | 26 | $table->string('username', 190)->unique(); |
27 | 27 | $table->string('password', 60); |
@@ -31,14 +31,14 @@ discard block |
||
31 | 31 | $table->timestamps(); |
32 | 32 | }); |
33 | 33 | |
34 | - Schema::create(config('admin.database.roles_table'), function (Blueprint $table) { |
|
34 | + Schema::create(config('admin.database.roles_table'), function(Blueprint $table) { |
|
35 | 35 | $table->increments('id'); |
36 | 36 | $table->string('name', 50)->unique(); |
37 | 37 | $table->string('slug', 50); |
38 | 38 | $table->timestamps(); |
39 | 39 | }); |
40 | 40 | |
41 | - Schema::create(config('admin.database.permissions_table'), function (Blueprint $table) { |
|
41 | + Schema::create(config('admin.database.permissions_table'), function(Blueprint $table) { |
|
42 | 42 | $table->increments('id'); |
43 | 43 | $table->string('name', 50)->unique(); |
44 | 44 | $table->string('slug', 50); |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $table->timestamps(); |
48 | 48 | }); |
49 | 49 | |
50 | - Schema::create(config('admin.database.menu_table'), function (Blueprint $table) { |
|
50 | + Schema::create(config('admin.database.menu_table'), function(Blueprint $table) { |
|
51 | 51 | $table->increments('id'); |
52 | 52 | $table->integer('parent_id')->default(0); |
53 | 53 | $table->integer('order')->default(0); |
@@ -59,35 +59,35 @@ discard block |
||
59 | 59 | $table->timestamps(); |
60 | 60 | }); |
61 | 61 | |
62 | - Schema::create(config('admin.database.role_users_table'), function (Blueprint $table) { |
|
62 | + Schema::create(config('admin.database.role_users_table'), function(Blueprint $table) { |
|
63 | 63 | $table->integer('role_id'); |
64 | 64 | $table->integer('user_id'); |
65 | 65 | $table->index(['role_id', 'user_id']); |
66 | 66 | $table->timestamps(); |
67 | 67 | }); |
68 | 68 | |
69 | - Schema::create(config('admin.database.role_permissions_table'), function (Blueprint $table) { |
|
69 | + Schema::create(config('admin.database.role_permissions_table'), function(Blueprint $table) { |
|
70 | 70 | $table->integer('role_id'); |
71 | 71 | $table->integer('permission_id'); |
72 | 72 | $table->index(['role_id', 'permission_id']); |
73 | 73 | $table->timestamps(); |
74 | 74 | }); |
75 | 75 | |
76 | - Schema::create(config('admin.database.user_permissions_table'), function (Blueprint $table) { |
|
76 | + Schema::create(config('admin.database.user_permissions_table'), function(Blueprint $table) { |
|
77 | 77 | $table->integer('user_id'); |
78 | 78 | $table->integer('permission_id'); |
79 | 79 | $table->index(['user_id', 'permission_id']); |
80 | 80 | $table->timestamps(); |
81 | 81 | }); |
82 | 82 | |
83 | - Schema::create(config('admin.database.role_menu_table'), function (Blueprint $table) { |
|
83 | + Schema::create(config('admin.database.role_menu_table'), function(Blueprint $table) { |
|
84 | 84 | $table->integer('role_id'); |
85 | 85 | $table->integer('menu_id'); |
86 | 86 | $table->index(['role_id', 'menu_id']); |
87 | 87 | $table->timestamps(); |
88 | 88 | }); |
89 | 89 | |
90 | - Schema::create(config('admin.database.operation_log_table'), function (Blueprint $table) { |
|
90 | + Schema::create(config('admin.database.operation_log_table'), function(Blueprint $table) { |
|
91 | 91 | $table->increments('id'); |
92 | 92 | $table->integer('user_id'); |
93 | 93 | $table->string('path'); |
@@ -16,7 +16,7 @@ |
||
16 | 16 | |
17 | 17 | $html = call_user_func_array($callback, [$this->row]); |
18 | 18 | |
19 | - $key = $this->getKey() . '-' . $this->getColumn()->getName(); |
|
19 | + $key = $this->getKey().'-'.$this->getColumn()->getName(); |
|
20 | 20 | |
21 | 21 | return <<<EOT |
22 | 22 | <span class="grid-expand" data-toggle="modal" data-target="#grid-modal-{$key}"> |