We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | $this->crud->hasAccessOrFail('revisions'); |
| 42 | 42 | |
| 43 | 43 | $revisionId = \Request::input('revision_id', false); |
| 44 | - if (! $revisionId) { |
|
| 44 | + if (!$revisionId) { |
|
| 45 | 45 | abort(500, 'Can\'t restore revision without revision_id'); |
| 46 | 46 | } else { |
| 47 | 47 | $this->crud->restoreRevision($id, $revisionId); // do the update |
@@ -27,12 +27,12 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | public function __construct() |
| 29 | 29 | { |
| 30 | - if (! $this->crud) { |
|
| 30 | + if (!$this->crud) { |
|
| 31 | 31 | $this->crud = app()->make(CrudPanel::class); |
| 32 | 32 | |
| 33 | 33 | // call the setup function inside this closure to also have the request there |
| 34 | 34 | // this way, developers can use things stored in session (auth variables, etc) |
| 35 | - $this->middleware(function ($request, $next) { |
|
| 35 | + $this->middleware(function($request, $next) { |
|
| 36 | 36 | $this->request = $request; |
| 37 | 37 | $this->crud->request = $request; |
| 38 | 38 | $this->setup(); |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | $this->data['title'] = ucfirst($this->crud->entity_name_plural); |
| 63 | 63 | |
| 64 | 64 | // get all entries if AJAX is not enabled |
| 65 | - if (! $this->data['crud']->ajaxTable()) { |
|
| 65 | + if (!$this->data['crud']->ajaxTable()) { |
|
| 66 | 66 | $this->data['entries'] = $this->data['crud']->getEntries(); |
| 67 | 67 | } |
| 68 | 68 | |
@@ -3,19 +3,17 @@ |
||
| 3 | 3 | namespace Backpack\CRUD\app\Http\Controllers; |
| 4 | 4 | |
| 5 | 5 | use Backpack\CRUD\CrudPanel; |
| 6 | -use Illuminate\Http\Request; |
|
| 7 | -use Illuminate\Support\Facades\Form as Form; |
|
| 6 | +use Backpack\CRUD\app\Http\Controllers\CrudFeatures\AjaxTable; |
|
| 7 | +use Backpack\CRUD\app\Http\Controllers\CrudFeatures\Reorder; |
|
| 8 | 8 | use Illuminate\Foundation\Bus\DispatchesJobs; |
| 9 | -use Illuminate\Routing\Controller as BaseController; |
|
| 10 | 9 | use Illuminate\Foundation\Validation\ValidatesRequests; |
| 11 | -use Backpack\CRUD\app\Http\Controllers\CrudFeatures\Reorder; |
|
| 12 | -use Backpack\CRUD\app\Http\Controllers\CrudFeatures\AjaxTable; |
|
| 10 | +use Illuminate\Http\Request; |
|
| 11 | +use Illuminate\Routing\Controller as BaseController; |
|
| 13 | 12 | // CRUD Traits for non-core features |
| 14 | 13 | use Backpack\CRUD\app\Http\Controllers\CrudFeatures\Revisions; |
| 15 | 14 | use Backpack\CRUD\app\Http\Controllers\CrudFeatures\SaveActions; |
| 16 | -use Backpack\CRUD\app\Http\Requests\CrudRequest as StoreRequest; |
|
| 17 | -use Backpack\CRUD\app\Http\Requests\CrudRequest as UpdateRequest; |
|
| 18 | 15 | use Backpack\CRUD\app\Http\Controllers\CrudFeatures\ShowDetailsRow; |
| 16 | +use Backpack\CRUD\app\Http\Requests\CrudRequest as UpdateRequest; |
|
| 19 | 17 | |
| 20 | 18 | class CrudController extends BaseController |
| 21 | 19 | { |
@@ -2,24 +2,24 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Backpack\CRUD; |
| 4 | 4 | |
| 5 | -use Backpack\CRUD\PanelTraits\Read; |
|
| 6 | -use Backpack\CRUD\PanelTraits\Tabs; |
|
| 7 | -use Backpack\CRUD\PanelTraits\Query; |
|
| 8 | -use Backpack\CRUD\PanelTraits\Views; |
|
| 9 | 5 | use Backpack\CRUD\PanelTraits\Access; |
| 6 | +use Backpack\CRUD\PanelTraits\AutoFocus; |
|
| 7 | +use Backpack\CRUD\PanelTraits\AutoSet; |
|
| 8 | +use Backpack\CRUD\PanelTraits\Buttons; |
|
| 9 | +use Backpack\CRUD\PanelTraits\Columns; |
|
| 10 | 10 | use Backpack\CRUD\PanelTraits\Create; |
| 11 | 11 | use Backpack\CRUD\PanelTraits\Delete; |
| 12 | 12 | use Backpack\CRUD\PanelTraits\Errors; |
| 13 | +use Backpack\CRUD\PanelTraits\FakeColumns; |
|
| 14 | +use Backpack\CRUD\PanelTraits\FakeFields; |
|
| 13 | 15 | use Backpack\CRUD\PanelTraits\Fields; |
| 14 | -use Backpack\CRUD\PanelTraits\Update; |
|
| 15 | -use Backpack\CRUD\PanelTraits\AutoSet; |
|
| 16 | -use Backpack\CRUD\PanelTraits\Buttons; |
|
| 17 | -use Backpack\CRUD\PanelTraits\Columns; |
|
| 18 | 16 | use Backpack\CRUD\PanelTraits\Filters; |
| 17 | +use Backpack\CRUD\PanelTraits\Query; |
|
| 18 | +use Backpack\CRUD\PanelTraits\Read; |
|
| 19 | 19 | use Backpack\CRUD\PanelTraits\Reorder; |
| 20 | -use Backpack\CRUD\PanelTraits\AutoFocus; |
|
| 21 | -use Backpack\CRUD\PanelTraits\FakeFields; |
|
| 22 | -use Backpack\CRUD\PanelTraits\FakeColumns; |
|
| 20 | +use Backpack\CRUD\PanelTraits\Tabs; |
|
| 21 | +use Backpack\CRUD\PanelTraits\Update; |
|
| 22 | +use Backpack\CRUD\PanelTraits\Views; |
|
| 23 | 23 | use Backpack\CRUD\PanelTraits\ViewsAndRestoresRevisions; |
| 24 | 24 | |
| 25 | 25 | class CrudPanel |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | */ |
| 85 | 85 | public function setModel($model_namespace) |
| 86 | 86 | { |
| 87 | - if (! class_exists($model_namespace)) { |
|
| 87 | + if (!class_exists($model_namespace)) { |
|
| 88 | 88 | throw new \Exception('This model does not exist.', 404); |
| 89 | 89 | } |
| 90 | 90 | |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | { |
| 126 | 126 | $complete_route = $route.'.index'; |
| 127 | 127 | |
| 128 | - if (! \Route::has($complete_route)) { |
|
| 128 | + if (!\Route::has($complete_route)) { |
|
| 129 | 129 | throw new \Exception('There are no routes for this route name.', 404); |
| 130 | 130 | } |
| 131 | 131 | |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | */ |
| 176 | 176 | public function getFirstOfItsTypeInArray($type, $array) |
| 177 | 177 | { |
| 178 | - return array_first($array, function ($item) use ($type) { |
|
| 178 | + return array_first($array, function($item) use ($type) { |
|
| 179 | 179 | return $item['type'] == $type; |
| 180 | 180 | }); |
| 181 | 181 | } |
@@ -192,8 +192,8 @@ discard block |
||
| 192 | 192 | |
| 193 | 193 | public function sync($type, $fields, $attributes) |
| 194 | 194 | { |
| 195 | - if (! empty($this->{$type})) { |
|
| 196 | - $this->{$type} = array_map(function ($field) use ($fields, $attributes) { |
|
| 195 | + if (!empty($this->{$type})) { |
|
| 196 | + $this->{$type} = array_map(function($field) use ($fields, $attributes) { |
|
| 197 | 197 | if (in_array($field['name'], (array) $fields)) { |
| 198 | 198 | $field = array_merge($field, $attributes); |
| 199 | 199 | } |
@@ -219,8 +219,8 @@ discard block |
||
| 219 | 219 | } |
| 220 | 220 | } |
| 221 | 221 | |
| 222 | - return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function ($item) use ($items) { |
|
| 223 | - return ! in_array($item['name'], $this->sort[$items]); |
|
| 222 | + return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use ($items) { |
|
| 223 | + return !in_array($item['name'], $this->sort[$items]); |
|
| 224 | 224 | })); |
| 225 | 225 | } |
| 226 | 226 | |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | */ |
| 244 | 244 | private function getRelationModel($relationString) |
| 245 | 245 | { |
| 246 | - $result = array_reduce(explode('.', $relationString), function ($obj, $method) { |
|
| 246 | + $result = array_reduce(explode('.', $relationString), function($obj, $method) { |
|
| 247 | 247 | return $obj->$method()->getRelated(); |
| 248 | 248 | }, $this->model); |
| 249 | 249 | |
@@ -123,6 +123,7 @@ |
||
| 123 | 123 | * |
| 124 | 124 | * @param [string] Route name. |
| 125 | 125 | * @param [array] Parameters. |
| 126 | + * @param string $route |
|
| 126 | 127 | */ |
| 127 | 128 | public function setRouteName($route, $parameters = []) |
| 128 | 129 | { |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Backpack\CRUD; |
| 4 | 4 | |
| 5 | -use Route; |
|
| 6 | 5 | use Illuminate\Support\ServiceProvider; |
| 7 | 6 | |
| 8 | 7 | class CrudServiceProvider extends ServiceProvider |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | */ |
| 75 | 75 | public function register() |
| 76 | 76 | { |
| 77 | - $this->app->bind('CRUD', function ($app) { |
|
| 77 | + $this->app->bind('CRUD', function($app) { |
|
| 78 | 78 | return new CRUD($app); |
| 79 | 79 | }); |
| 80 | 80 | |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | $loader->alias('Image', \Intervention\Image\Facades\Image::class); |
| 93 | 93 | |
| 94 | 94 | // map the elfinder prefix |
| 95 | - if (! \Config::get('elfinder.route.prefix')) { |
|
| 95 | + if (!\Config::get('elfinder.route.prefix')) { |
|
| 96 | 96 | \Config::set('elfinder.route.prefix', \Config::get('backpack.base.route_prefix').'/elfinder'); |
| 97 | 97 | } |
| 98 | 98 | } |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | { |
| 113 | 113 | $crudPubPath = public_path('vendor/backpack/crud'); |
| 114 | 114 | |
| 115 | - if (! is_dir($crudPubPath)) { |
|
| 115 | + if (!is_dir($crudPubPath)) { |
|
| 116 | 116 | return true; |
| 117 | 117 | } |
| 118 | 118 | |
@@ -23,13 +23,13 @@ |
||
| 23 | 23 | } |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | - //for update form, get initial state of the entity |
|
| 27 | - if( isset($id) && $id ){ |
|
| 26 | + //for update form, get initial state of the entity |
|
| 27 | + if( isset($id) && $id ){ |
|
| 28 | 28 | |
| 29 | 29 | //get entity with relations for primary dependency |
| 30 | 30 | $entity_dependencies = $entity_model->with($primary_dependency['entity']) |
| 31 | - ->with($primary_dependency['entity'].'.'.$primary_dependency['entity_secondary']) |
|
| 32 | - ->find($id); |
|
| 31 | + ->with($primary_dependency['entity'].'.'.$primary_dependency['entity_secondary']) |
|
| 32 | + ->find($id); |
|
| 33 | 33 | |
| 34 | 34 | $secondaries_from_primary = []; |
| 35 | 35 | |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | //for update form, get initial state of the entity |
| 27 | - if( isset($id) && $id ){ |
|
| 27 | + if (isset($id) && $id) { |
|
| 28 | 28 | |
| 29 | 29 | //get entity with relations for primary dependency |
| 30 | 30 | $entity_dependencies = $entity_model->with($primary_dependency['entity']) |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | public function tabsDisabled() |
| 31 | 31 | { |
| 32 | - return ! $this->tabsEnabled; |
|
| 32 | + return !$this->tabsEnabled; |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | public function setTabsType($type) |
@@ -92,13 +92,13 @@ discard block |
||
| 92 | 92 | if ($this->tabExists($label)) { |
| 93 | 93 | $all_fields = $this->getCurrentFields(); |
| 94 | 94 | |
| 95 | - $fields_for_current_tab = collect($all_fields)->filter(function ($value, $key) use ($label) { |
|
| 95 | + $fields_for_current_tab = collect($all_fields)->filter(function($value, $key) use ($label) { |
|
| 96 | 96 | return isset($value['tab']) && $value['tab'] == $label; |
| 97 | 97 | }); |
| 98 | 98 | |
| 99 | 99 | if ($this->isLastTab($label)) { |
| 100 | - $fields_without_a_tab = collect($all_fields)->filter(function ($value, $key) { |
|
| 101 | - return ! isset($value['tab']); |
|
| 100 | + $fields_without_a_tab = collect($all_fields)->filter(function($value, $key) { |
|
| 101 | + return !isset($value['tab']); |
|
| 102 | 102 | }); |
| 103 | 103 | |
| 104 | 104 | $fields_for_current_tab = $fields_for_current_tab->merge($fields_without_a_tab); |
@@ -116,11 +116,11 @@ discard block |
||
| 116 | 116 | $fields = $this->getCurrentFields(); |
| 117 | 117 | |
| 118 | 118 | $fields_with_tabs = collect($fields) |
| 119 | - ->filter(function ($value, $key) { |
|
| 119 | + ->filter(function($value, $key) { |
|
| 120 | 120 | return isset($value['tab']); |
| 121 | 121 | }) |
| 122 | - ->each(function ($value, $key) use (&$tabs) { |
|
| 123 | - if (! in_array($value['tab'], $tabs)) { |
|
| 122 | + ->each(function($value, $key) use (&$tabs) { |
|
| 123 | + if (!in_array($value['tab'], $tabs)) { |
|
| 124 | 124 | $tabs[] = $value['tab']; |
| 125 | 125 | } |
| 126 | 126 | }); |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | */ |
| 20 | 20 | public function getEntry($id) |
| 21 | 21 | { |
| 22 | - if (! $this->entry) { |
|
| 22 | + if (!$this->entry) { |
|
| 23 | 23 | $this->entry = $this->model->findOrFail($id); |
| 24 | 24 | $this->entry = $this->entry->withFakes(); |
| 25 | 25 | } |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | public function hasUploadFields($form, $id = false) |
| 95 | 95 | { |
| 96 | 96 | $fields = $this->getFields($form, $id); |
| 97 | - $upload_fields = array_where($fields, function ($value, $key) { |
|
| 97 | + $upload_fields = array_where($fields, function($value, $key) { |
|
| 98 | 98 | return isset($value['upload']) && $value['upload'] == true; |
| 99 | 99 | }); |
| 100 | 100 | |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | */ |
| 193 | 193 | public function getCellView($column, $entry) |
| 194 | 194 | { |
| 195 | - if (! isset($column['type'])) { |
|
| 195 | + if (!isset($column['type'])) { |
|
| 196 | 196 | return \View::make('crud::columns.text')->with('crud', $this)->with('column', $column)->with('entry', $entry)->render(); |
| 197 | 197 | } else { |
| 198 | 198 | if (view()->exists('vendor.backpack.crud.columns.'.$column['type'])) { |
@@ -89,6 +89,7 @@ |
||
| 89 | 89 | * Upload fields are the ones that have "upload" => true defined on them. |
| 90 | 90 | * @param [form] create / update / both - defaults to 'both' |
| 91 | 91 | * @param [id] id of the entity - defaults to false |
| 92 | + * @param string $form |
|
| 92 | 93 | * @return bool |
| 93 | 94 | */ |
| 94 | 95 | public function hasUploadFields($form, $id = false) |
@@ -3,15 +3,15 @@ |
||
| 3 | 3 | <?php |
| 4 | 4 | // if the column has been cast to Carbon or Date (using attribute casting) |
| 5 | 5 | // get the value as a date string |
| 6 | - if ( isset($entry) && ($entry->{$field['start_name']} instanceof \Carbon\Carbon || $entry->{$field['start_name']} instanceof \Jenssegers\Date\Date) ) { |
|
| 7 | - $start_name = $entry->{$field['start_name']}->format( 'Y-m-d H:i:s' ); |
|
| 6 | + if (isset($entry) && ($entry->{$field['start_name']} instanceof \Carbon\Carbon || $entry->{$field['start_name']} instanceof \Jenssegers\Date\Date)) { |
|
| 7 | + $start_name = $entry->{$field['start_name']}->format('Y-m-d H:i:s'); |
|
| 8 | 8 | } else { |
| 9 | 9 | $start_name = null; |
| 10 | 10 | } |
| 11 | 11 | |
| 12 | 12 | //Do the same as the above but for the range end field |
| 13 | - if ( isset($entry) && ($entry->{$field['end_name']} instanceof \Carbon\Carbon || $entry->{$field['end_name']} instanceof \Jenssegers\Date\Date) ) { |
|
| 14 | - $end_name = $entry->{$field['end_name']}->format( 'Y-m-d H:i:s' ); |
|
| 13 | + if (isset($entry) && ($entry->{$field['end_name']} instanceof \Carbon\Carbon || $entry->{$field['end_name']} instanceof \Jenssegers\Date\Date)) { |
|
| 14 | + $end_name = $entry->{$field['end_name']}->format('Y-m-d H:i:s'); |
|
| 15 | 15 | } else { |
| 16 | 16 | $end_name = null; |
| 17 | 17 | } |
@@ -65,7 +65,7 @@ |
||
| 65 | 65 | 'delete_confirmation_not_deleted_title' => 'Não apagado', |
| 66 | 66 | 'delete_confirmation_not_deleted_message' => 'Está tudo bem!. O item não foi apagado.', |
| 67 | 67 | |
| 68 | - // DataTables translation |
|
| 68 | + // DataTables translation |
|
| 69 | 69 | 'emptyTable' => 'Sem dados disponíveis na tabela', |
| 70 | 70 | 'info' => 'A mostrar _START_ a _END_ de _TOTAL_ registos', |
| 71 | 71 | 'infoEmpty' => 'A mostrar 0 a 0 de 0 registos', |