We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -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 | { |
@@ -124,8 +124,9 @@ discard block |
||
| 124 | 124 | $this->data['entry'] = $this->crud->entry = $item; |
| 125 | 125 | |
| 126 | 126 | // show a success message |
| 127 | - if($this->crud->model::find($item->id)) |
|
| 128 | - \Alert::success(trans('backpack::crud.insert_success'))->flash(); |
|
| 127 | + if($this->crud->model::find($item->id)) { |
|
| 128 | + \Alert::success(trans('backpack::crud.insert_success'))->flash(); |
|
| 129 | + } |
|
| 129 | 130 | |
| 130 | 131 | // save the redirect choice for next time |
| 131 | 132 | $this->setSaveAction(); |
@@ -156,8 +157,8 @@ discard block |
||
| 156 | 157 | |
| 157 | 158 | $this->data['id'] = $id; |
| 158 | 159 | |
| 159 | - if($this->crud->eagerLoad && !empty($this->crud->eagerLoad)) |
|
| 160 | - foreach($this->crud->eagerLoad as $relation_name) |
|
| 160 | + if($this->crud->eagerLoad && !empty($this->crud->eagerLoad)) { |
|
| 161 | + foreach($this->crud->eagerLoad as $relation_name) |
|
| 161 | 162 | { |
| 162 | 163 | if($this->data['entry'] && $rel = $this->data['entry']->{$relation_name}) |
| 163 | 164 | { |
@@ -166,6 +167,7 @@ discard block |
||
| 166 | 167 | if(starts_with($field_name, $relation_name)) |
| 167 | 168 | { |
| 168 | 169 | $column_name = str_replace("{$relation_name}.", '', $field_name); |
| 170 | + } |
|
| 169 | 171 | |
| 170 | 172 | $this->data['fields'][$field_name]['value'] = $rel->{$column_name}; |
| 171 | 173 | } |
@@ -284,10 +286,11 @@ discard block |
||
| 284 | 286 | }) |
| 285 | 287 | ->toArray(); |
| 286 | 288 | |
| 287 | - if(!$rel = $item->{$relation_name}) |
|
| 288 | - $item->{$relation_name}()->create($data); |
|
| 289 | - else |
|
| 290 | - $item->{$relation_name}->update($data); |
|
| 289 | + if(!$rel = $item->{$relation_name}) { |
|
| 290 | + $item->{$relation_name}()->create($data); |
|
| 291 | + } else { |
|
| 292 | + $item->{$relation_name}->update($data); |
|
| 293 | + } |
|
| 291 | 294 | }); |
| 292 | 295 | } |
| 293 | 296 | } |
@@ -2,27 +2,27 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Backpack\CRUD; |
| 4 | 4 | |
| 5 | -use Backpack\CRUD\PanelTraits\Read; |
|
| 6 | -use Backpack\CRUD\PanelTraits\Tabs; |
|
| 5 | +use Backedin\BackpackTraits\Backpack\Buttons; |
|
| 7 | 6 | use Backedin\BackpackTraits\Backpack\Query; |
| 8 | -use Backpack\CRUD\PanelTraits\Views; |
|
| 9 | 7 | use Backpack\CRUD\PanelTraits\Access; |
| 8 | +use Backpack\CRUD\PanelTraits\AutoFocus; |
|
| 9 | +use Backpack\CRUD\PanelTraits\AutoSet; |
|
| 10 | +use Backpack\CRUD\PanelTraits\Columns; |
|
| 10 | 11 | use Backpack\CRUD\PanelTraits\Create; |
| 11 | 12 | use Backpack\CRUD\PanelTraits\Delete; |
| 12 | 13 | use Backpack\CRUD\PanelTraits\Errors; |
| 14 | +use Backpack\CRUD\PanelTraits\FakeColumns; |
|
| 15 | +use Backpack\CRUD\PanelTraits\FakeFields; |
|
| 13 | 16 | use Backpack\CRUD\PanelTraits\Fields; |
| 14 | -use Backpack\CRUD\PanelTraits\Search; |
|
| 15 | -use Backpack\CRUD\PanelTraits\Update; |
|
| 16 | -use Backpack\CRUD\PanelTraits\AutoSet; |
|
| 17 | -use Backedin\BackpackTraits\Backpack\Buttons; |
|
| 18 | -use Backpack\CRUD\PanelTraits\Columns; |
|
| 19 | 17 | use Backpack\CRUD\PanelTraits\Filters; |
| 18 | +use Backpack\CRUD\PanelTraits\Read; |
|
| 20 | 19 | use Backpack\CRUD\PanelTraits\Reorder; |
| 21 | -use Backpack\CRUD\PanelTraits\AutoFocus; |
|
| 22 | -use Backpack\CRUD\PanelTraits\FakeFields; |
|
| 23 | -use Backpack\CRUD\PanelTraits\FakeColumns; |
|
| 24 | -use Illuminate\Database\Eloquent\Collection; |
|
| 20 | +use Backpack\CRUD\PanelTraits\Search; |
|
| 21 | +use Backpack\CRUD\PanelTraits\Tabs; |
|
| 22 | +use Backpack\CRUD\PanelTraits\Update; |
|
| 23 | +use Backpack\CRUD\PanelTraits\Views; |
|
| 25 | 24 | use Backpack\CRUD\PanelTraits\ViewsAndRestoresRevisions; |
| 25 | +use Illuminate\Database\Eloquent\Collection; |
|
| 26 | 26 | |
| 27 | 27 | class CrudPanel |
| 28 | 28 | { |