@@ -39,10 +39,10 @@ |
||
| 39 | 39 | $model->setName($menu->name); |
| 40 | 40 | $model->setBasepath(config('crudbooster.ADMIN_PATH').'/'.basename($model->getUrl())); |
| 41 | 41 | } else { |
| 42 | - $model->setUrl($menu->path); |
|
| 42 | + $model->setUrl($menu->path); |
|
| 43 | 43 | $model->setIcon($menu->icon); |
| 44 | 44 | $model->setName($menu->name); |
| 45 | - } |
|
| 45 | + } |
|
| 46 | 46 | |
| 47 | 47 | if(request()->is($model->getBasepath()."*")) { |
| 48 | 48 | $model->setIsActive(true); |
@@ -21,8 +21,8 @@ discard block |
||
| 21 | 21 | public function indexRender($row, $column) |
| 22 | 22 | { |
| 23 | 23 | if($column->getFormat()) { |
| 24 | - $datetime = date_create_from_format($column->getFormat(), $value); |
|
| 25 | - return $datetime ? $datetime->format('Y-m-d H:i:s') : $value; |
|
| 24 | + $datetime = date_create_from_format($column->getFormat(), $value); |
|
| 25 | + return $datetime ? $datetime->format('Y-m-d H:i:s') : $value; |
|
| 26 | 26 | }else{ |
| 27 | 27 | return $row->{$column->getField()}; |
| 28 | 28 | } |
@@ -30,11 +30,11 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | public function assignment($value, $column) |
| 32 | 32 | { |
| 33 | - if($column->getFormat()) { |
|
| 34 | - return date_create_from_format($column->getFormat(), $value)->format('Y-m-d H:i:s'); |
|
| 35 | - } else { |
|
| 36 | - return $value; |
|
| 37 | - } |
|
| 33 | + if($column->getFormat()) { |
|
| 34 | + return date_create_from_format($column->getFormat(), $value)->format('Y-m-d H:i:s'); |
|
| 35 | + } else { |
|
| 36 | + return $value; |
|
| 37 | + } |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | public function detailRender($row, $column) |
@@ -28,12 +28,12 @@ |
||
| 28 | 28 | |
| 29 | 29 | public function assignment($value, $column) |
| 30 | 30 | { |
| 31 | - if($column->getFormat()) { |
|
| 32 | - $date = date_create_from_format($column->getFormat(), $value); |
|
| 33 | - return $date ? $date->format('Y-m-d') : $value; |
|
| 34 | - } else { |
|
| 35 | - return $value; |
|
| 36 | - } |
|
| 31 | + if($column->getFormat()) { |
|
| 32 | + $date = date_create_from_format($column->getFormat(), $value); |
|
| 33 | + return $date ? $date->format('Y-m-d') : $value; |
|
| 34 | + } else { |
|
| 35 | + return $value; |
|
| 36 | + } |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | public function detailRender($row, $column) |