From dd83f2762fb0cb8129b47639897fb28c2c90f7e7 Mon Sep 17 00:00:00 2001 From: jeanbernard69 Date: Mon, 1 May 2017 07:35:11 +0200 Subject: [PATCH 001/124] Update AutoSet.php Avoid multiple database request to get column listing --- src/PanelTraits/AutoSet.php | 47 ++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/src/PanelTraits/AutoSet.php b/src/PanelTraits/AutoSet.php index f3310fef20..9028437694 100644 --- a/src/PanelTraits/AutoSet.php +++ b/src/PanelTraits/AutoSet.php @@ -20,21 +20,21 @@ public function setFromDb() // $this->labels[$field] = $this->makeLabel($field); $new_field = [ - 'name' => $field, - 'label' => ucfirst($field), - 'value' => null, - 'type' => $this->getFieldTypeFromDbColumnType($field), - 'values' => [], + 'name' => $field, + 'label' => ucfirst($field), + 'value' => null, + 'type' => $this->getFieldTypeFromDbColumnType($field), + 'values' => [], 'attributes' => [], ]; $this->create_fields[$field] = $new_field; $this->update_fields[$field] = $new_field; - if (! in_array($field, $this->model->getHidden())) { + if (!in_array($field, $this->model->getHidden())) { $this->columns[$field] = [ - 'name' => $field, + 'name' => $field, 'label' => ucfirst($field), - 'type' => $this->getFieldTypeFromDbColumnType($field), + 'type' => $this->getFieldTypeFromDbColumnType($field), ]; } }, $this->getDbColumnsNames()); @@ -47,9 +47,10 @@ public function setFromDb() */ public function getDbColumnTypes() { - $table_columns = $this->model->getConnection()->getSchemaBuilder()->getColumnListing($this->model->getTable()); + // Pass this variable in instance proprierty to avoid multiple request to database to get column listing + $this->table_columns = $this->model->getConnection()->getSchemaBuilder()->getColumnListing($this->model->getTable()); - foreach ($table_columns as $key => $column) { + foreach ($this->table_columns as $key => $column) { $column_type = $this->model->getConnection()->getSchemaBuilder()->getColumnType($this->model->getTable(), $column); $this->db_column_types[$column]['type'] = trim(preg_replace('/\(\d+\)(.*)/i', '', $column_type)); $this->db_column_types[$column]['default'] = ''; // no way to do this using DBAL?! @@ -67,7 +68,7 @@ public function getDbColumnTypes() */ public function getFieldTypeFromDbColumnType($field) { - if (! array_key_exists($field, $this->db_column_types)) { + if (!array_key_exists($field, $this->db_column_types)) { return 'text'; } @@ -85,13 +86,13 @@ public function getFieldTypeFromDbColumnType($field) case 'mediumint': case 'longint': return 'number'; - break; + break; case 'string': case 'varchar': case 'set': return 'text'; - break; + break; // case 'enum': // return 'enum'; @@ -99,29 +100,29 @@ public function getFieldTypeFromDbColumnType($field) case 'tinyint': return 'active'; - break; + break; case 'text': case 'mediumtext': case 'longtext': return 'textarea'; - break; + break; case 'date': return 'date'; - break; + break; case 'datetime': case 'timestamp': return 'datetime'; - break; + break; case 'time': return 'time'; - break; + break; default: return 'text'; - break; + break; } } @@ -145,11 +146,13 @@ public function makeLabel($value) public function getDbColumnsNames() { // Automatically-set columns should be both in the database, and in the $fillable variable on the Eloquent Model - $columns = $this->model->getConnection()->getSchemaBuilder()->getColumnListing($this->model->getTable()); + + $columns = $this->table_columns; + $fillable = $this->model->getFillable(); - if (! empty($fillable)) { - $columns = array_intersect($columns, $fillable); + if (!empty($fillable)) { + $columns = array_intersect($this->table_columns, $fillable); } // but not updated_at, deleted_at From a4b7f62a1779695df041dac66e0ba0024115a6fc Mon Sep 17 00:00:00 2001 From: ran81 Date: Tue, 9 Jan 2018 14:54:45 +0800 Subject: [PATCH 002/124] Allow custom sorting for crud columns --- src/PanelTraits/Query.php | 17 +++++++++++++++++ .../Http/Controllers/CrudFeatures/AjaxTable.php | 5 +++++ 2 files changed, 22 insertions(+) diff --git a/src/PanelTraits/Query.php b/src/PanelTraits/Query.php index dee473c54d..1b61888415 100644 --- a/src/PanelTraits/Query.php +++ b/src/PanelTraits/Query.php @@ -53,6 +53,23 @@ public function orderBy($field, $order = 'asc') return $this->query->orderBy($field, $order); } + /** + * Order the results of the query in a custom way. + */ + public function customOrderBy($column, $column_direction) + { + if (isset($column['orderLogic'])) { + $this->query->getQuery()->orders = null; + + $orderLogic = $column['orderLogic']; + + if (is_callable($orderLogic)) { + return $orderLogic($this->query, $column, $column_direction); + } + } + return $this->query; + } + /** * Group the results of the query in a certain way. * diff --git a/src/app/Http/Controllers/CrudFeatures/AjaxTable.php b/src/app/Http/Controllers/CrudFeatures/AjaxTable.php index 5ed7bfe733..7a46f7218a 100644 --- a/src/app/Http/Controllers/CrudFeatures/AjaxTable.php +++ b/src/app/Http/Controllers/CrudFeatures/AjaxTable.php @@ -45,6 +45,11 @@ public function search() if ($column['tableColumn']) { $this->crud->orderBy($column['name'], $column_direction); } + + // check for custom order logic in the column definition + if (isset($column['orderLogic'])) { + $this->crud->customOrderBy($column, $column_direction); + } } $entries = $this->crud->getEntries(); From 23acdd3fe8f1fbab517021d21341b2379a7af0bd Mon Sep 17 00:00:00 2001 From: ran81 Date: Wed, 17 Jan 2018 11:46:48 +0800 Subject: [PATCH 003/124] Fix comments. --- src/PanelTraits/Query.php | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/PanelTraits/Query.php b/src/PanelTraits/Query.php index 1b61888415..3819348257 100644 --- a/src/PanelTraits/Query.php +++ b/src/PanelTraits/Query.php @@ -55,18 +55,26 @@ public function orderBy($field, $order = 'asc') /** * Order the results of the query in a custom way. + * + * @param [type] + * @param string + * + * @return [type] */ - public function customOrderBy($column, $column_direction) + public function customOrderBy($column, $column_direction = 'asc') { - if (isset($column['orderLogic'])) { - $this->query->getQuery()->orders = null; - - $orderLogic = $column['orderLogic']; + if (! isset($column['orderLogic'])) { + return $this->query; + } + + $this->query->getQuery()->orders = null; - if (is_callable($orderLogic)) { - return $orderLogic($this->query, $column, $column_direction); - } + $orderLogic = $column['orderLogic']; + + if (is_callable($orderLogic)) { + return $orderLogic($this->query, $column, $column_direction); } + return $this->query; } From e3d5e3370bb263df4fe8f62192913fbf716fa74a Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 2 May 2018 00:23:47 +0300 Subject: [PATCH 004/124] Replace ucfirst with mb_convert_case --- src/app/Http/Controllers/CrudController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/Http/Controllers/CrudController.php b/src/app/Http/Controllers/CrudController.php index 23851b0068..f851db7678 100644 --- a/src/app/Http/Controllers/CrudController.php +++ b/src/app/Http/Controllers/CrudController.php @@ -64,7 +64,7 @@ public function index() $this->crud->hasAccessOrFail('list'); $this->data['crud'] = $this->crud; - $this->data['title'] = ucfirst($this->crud->entity_name_plural); + $this->data['title'] = mb_convert_case($this->crud->entity_name_plural, MB_CASE_TITLE); // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package return view($this->crud->getListView(), $this->data); From b7596e982e628dc41118fdc160353cab2af4a1d3 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Thu, 10 May 2018 05:40:38 +0000 Subject: [PATCH 005/124] fixes #1370 - multibyte ucfirst --- src/PanelTraits/AutoSet.php | 2 +- src/PanelTraits/Columns.php | 6 +++--- src/PanelTraits/Fields.php | 2 +- src/app/Http/Controllers/CrudFeatures/Revisions.php | 2 +- src/resources/views/inc/revision_timeline.blade.php | 4 ++-- src/resources/views/show.blade.php | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/PanelTraits/AutoSet.php b/src/PanelTraits/AutoSet.php index 9ce6e62e3a..a34c334d6a 100644 --- a/src/PanelTraits/AutoSet.php +++ b/src/PanelTraits/AutoSet.php @@ -164,7 +164,7 @@ public function makeLabel($value) return ($this->labeller)($value); } - return trim(preg_replace('/(id|at|\[\])$/i', '', ucfirst(str_replace('_', ' ', $value)))); + return trim(preg_replace('/(id|at|\[\])$/i', '', mb_ucfirst(str_replace('_', ' ', $value)))); } /** diff --git a/src/PanelTraits/Columns.php b/src/PanelTraits/Columns.php index 142f8804a7..fb112f6e98 100644 --- a/src/PanelTraits/Columns.php +++ b/src/PanelTraits/Columns.php @@ -37,7 +37,7 @@ public function setColumns($columns) } else { $this->addColumn([ 'name' => $column, - 'label' => ucfirst($column), + 'label' => mb_ucfirst($column), 'type' => 'text', ]); } @@ -47,7 +47,7 @@ public function setColumns($columns) if (is_string($columns)) { $this->addColumn([ 'name' => $columns, - 'label' => ucfirst($columns), + 'label' => mb_ucfirst($columns), 'type' => 'text', ]); } @@ -198,7 +198,7 @@ public function addDefaultTypeToColumn($column) public function addDefaultLabel($array) { if (! array_key_exists('label', (array) $array) && array_key_exists('name', (array) $array)) { - $array = array_merge(['label' => ucfirst($this->makeLabel($array['name']))], $array); + $array = array_merge(['label' => mb_ucfirst($this->makeLabel($array['name']))], $array); return $array; } diff --git a/src/PanelTraits/Fields.php b/src/PanelTraits/Fields.php index e836b37a6a..a31d55b235 100644 --- a/src/PanelTraits/Fields.php +++ b/src/PanelTraits/Fields.php @@ -32,7 +32,7 @@ public function addField($field, $form = 'both') // if the label is missing, we should set it if (! isset($completeFieldsArray['label'])) { - $completeFieldsArray['label'] = ucfirst($completeFieldsArray['name']); + $completeFieldsArray['label'] = mb_ucfirst($completeFieldsArray['name']); } // if the field type is missing, we should set it diff --git a/src/app/Http/Controllers/CrudFeatures/Revisions.php b/src/app/Http/Controllers/CrudFeatures/Revisions.php index 7e5ae1036f..b9819a137d 100644 --- a/src/app/Http/Controllers/CrudFeatures/Revisions.php +++ b/src/app/Http/Controllers/CrudFeatures/Revisions.php @@ -21,7 +21,7 @@ public function listRevisions($id) // get the info for that entry $this->data['entry'] = $this->crud->getEntry($id); $this->data['crud'] = $this->crud; - $this->data['title'] = ucfirst($this->crud->entity_name).' '.trans('backpack::crud.revisions'); + $this->data['title'] = mb_ucfirst($this->crud->entity_name).' '.trans('backpack::crud.revisions'); $this->data['id'] = $id; $this->data['revisions'] = $this->crud->listRevisions($id); diff --git a/src/resources/views/inc/revision_timeline.blade.php b/src/resources/views/inc/revision_timeline.blade.php index 7751419b54..dadd08cfb9 100644 --- a/src/resources/views/inc/revision_timeline.blade.php +++ b/src/resources/views/inc/revision_timeline.blade.php @@ -17,8 +17,8 @@

{{ $history->userResponsible()?$history->userResponsible()->name:trans('backpack::crud.guest_user') }} {{ trans('backpack::crud.changed_the') }} {{ $history->fieldName() }}

-
{{ ucfirst(trans('backpack::crud.from')) }}:
-
{{ ucfirst(trans('backpack::crud.to')) }}:
+
{{ mb_ucfirst(trans('backpack::crud.from')) }}:
+
{{ mb_ucfirst(trans('backpack::crud.to')) }}:
{{ $history->oldValue() }}
diff --git a/src/resources/views/show.blade.php b/src/resources/views/show.blade.php index 8ce5dc9800..e9d2e4bb1c 100644 --- a/src/resources/views/show.blade.php +++ b/src/resources/views/show.blade.php @@ -4,7 +4,7 @@

{{ $crud->entity_name_plural }} - {{ ucfirst(trans('backpack::crud.preview')).' '.$crud->entity_name }}. + {{ mb_ucfirst(trans('backpack::crud.preview')).' '.$crud->entity_name }}.

  1. {{ trans('backpack::crud.admin') }}
    2. From dfe85df4169377955dc4947eb54e66d480f46eb6 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Thu, 10 May 2018 05:43:16 +0000 Subject: [PATCH 006/124] leftover mb_convert_case --- src/app/Http/Controllers/CrudController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/Http/Controllers/CrudController.php b/src/app/Http/Controllers/CrudController.php index f851db7678..46b80e6560 100644 --- a/src/app/Http/Controllers/CrudController.php +++ b/src/app/Http/Controllers/CrudController.php @@ -64,7 +64,7 @@ public function index() $this->crud->hasAccessOrFail('list'); $this->data['crud'] = $this->crud; - $this->data['title'] = mb_convert_case($this->crud->entity_name_plural, MB_CASE_TITLE); + $this->data['title'] = mb_ucfirst($this->crud->entity_name_plural); // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package return view($this->crud->getListView(), $this->data); From 62e4e5fbf13a0b1ad876710ba121b986178a1076 Mon Sep 17 00:00:00 2001 From: Alan Brande Date: Fri, 25 May 2018 11:46:22 -0300 Subject: [PATCH 007/124] Added Google address field --- .../views/fields/address_google.blade.php | 119 ++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 src/resources/views/fields/address_google.blade.php diff --git a/src/resources/views/fields/address_google.blade.php b/src/resources/views/fields/address_google.blade.php new file mode 100644 index 0000000000..acfeb53edb --- /dev/null +++ b/src/resources/views/fields/address_google.blade.php @@ -0,0 +1,119 @@ + + + + +
    + + @include('crud::inc.field_translatable_icon') + + + @if(isset($field['prefix']) || isset($field['suffix'])) +
    @endif + @if(isset($field['prefix'])) +
    {!! $field['prefix'] !!}
    @endif + @if(isset($field['store_as_json']) && $field['store_as_json']) + + @else + + @endif + @if(isset($field['suffix'])) +
    {!! $field['suffix'] !!}
    @endif + @if(isset($field['prefix']) || isset($field['suffix']))
    @endif + + {{-- HINT --}} + @if (isset($field['hint'])) +

    {!! $field['hint'] !!}

    + @endif +
    + +{{-- Note: you can use to only load some CSS/JS once, even though there are multiple instances of it --}} + +{{-- ########################################## --}} +{{-- Extra CSS and JS for this particular field --}} +{{-- If a field type is shown multiple times on a form, the CSS and JS will only be loaded once --}} +@if ($crud->checkIfFieldIsFirstOfItsType($field, $fields)) + + {{-- FIELD CSS - will be loaded in the after_styles section --}} + @push('crud_fields_styles') + + @endpush + + {{-- FIELD JS - will be loaded in the after_scripts section --}} + @push('crud_fields_scripts') + + + + @endpush + +@endif +{{-- End of Extra CSS and JS --}} +{{-- ########################################## --}} From 8bb6f3ad750b8ef4502c977be0ef57d33a0f3d4b Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Fri, 29 Jun 2018 08:47:43 +0300 Subject: [PATCH 008/124] pass all form inputs to select2_from_array and select2_from_array_multiple fields --- src/resources/views/fields/select2_from_ajax.blade.php | 6 ++++-- .../views/fields/select2_from_ajax_multiple.blade.php | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/resources/views/fields/select2_from_ajax.blade.php b/src/resources/views/fields/select2_from_ajax.blade.php index 0952d486ca..d4c45eb6bf 100644 --- a/src/resources/views/fields/select2_from_ajax.blade.php +++ b/src/resources/views/fields/select2_from_ajax.blade.php @@ -76,9 +76,10 @@ jQuery(document).ready(function($) { // trigger select2 for each untriggered select2 box $("#select2_ajax_{{ $field['name'] }}").each(function (i, obj) { + var form = $(obj).closest('form'); + if (!$(obj).hasClass("select2-hidden-accessible")) { - $(obj).select2({ theme: 'bootstrap', multiple: false, @@ -96,7 +97,8 @@ data: function (params) { return { q: params.term, // search term - page: params.page + page: params.page, // pagination + form: form.serializeArray() // all other form inputs }; }, processResults: function (data, params) { diff --git a/src/resources/views/fields/select2_from_ajax_multiple.blade.php b/src/resources/views/fields/select2_from_ajax_multiple.blade.php index 213c9a7859..c9d4814553 100644 --- a/src/resources/views/fields/select2_from_ajax_multiple.blade.php +++ b/src/resources/views/fields/select2_from_ajax_multiple.blade.php @@ -62,6 +62,8 @@ jQuery(document).ready(function($) { // trigger select2 for each untriggered select2 box $("#select2_ajax_multiple_{{ $field['name'] }}").each(function (i, obj) { + var form = $(obj).closest('form'); + if (!$(obj).hasClass("select2-hidden-accessible")) { $(obj).select2({ @@ -76,7 +78,8 @@ data: function (params) { return { q: params.term, // search term - page: params.page + page: params.page, // pagination + form: form.serializeArray() // all other form inputs }; }, processResults: function (data, params) { From 7147634fc2d6990623984413b8fea1b2224fdd4a Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Sun, 8 Jul 2018 10:35:15 +0300 Subject: [PATCH 009/124] Added setters and getters for the current CRUD operation --- src/CrudPanel.php | 3 +- src/PanelTraits/Operations.php | 37 +++++++++++++++++++ .../Http/Controllers/Operations/Create.php | 2 + .../Http/Controllers/Operations/Delete.php | 1 + .../Controllers/Operations/ListEntries.php | 3 ++ .../Http/Controllers/Operations/Reorder.php | 2 + .../Http/Controllers/Operations/Revisions.php | 2 + src/app/Http/Controllers/Operations/Show.php | 1 + .../Http/Controllers/Operations/Update.php | 2 + 9 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 src/PanelTraits/Operations.php diff --git a/src/CrudPanel.php b/src/CrudPanel.php index b84595dc08..7d17e3d1c2 100644 --- a/src/CrudPanel.php +++ b/src/CrudPanel.php @@ -7,6 +7,7 @@ use Backpack\CRUD\PanelTraits\Query; use Backpack\CRUD\PanelTraits\Views; use Backpack\CRUD\PanelTraits\Access; +use Backpack\CRUD\PanelTraits\Operations; use Backpack\CRUD\PanelTraits\Create; use Backpack\CRUD\PanelTraits\Delete; use Backpack\CRUD\PanelTraits\Errors; @@ -27,7 +28,7 @@ class CrudPanel { - use Create, Read, Search, Update, Delete, Errors, Reorder, Access, Columns, Fields, Query, Buttons, AutoSet, FakeFields, FakeColumns, ViewsAndRestoresRevisions, AutoFocus, Filters, Tabs, Views, RequiredFields; + use Create, Read, Search, Update, Delete, Errors, Reorder, Access, Columns, Fields, Query, Buttons, AutoSet, FakeFields, FakeColumns, ViewsAndRestoresRevisions, AutoFocus, Filters, Tabs, Views, RequiredFields, Operations; // -------------- // CRUD variables diff --git a/src/PanelTraits/Operations.php b/src/PanelTraits/Operations.php new file mode 100644 index 0000000000..9fe5a1a2b5 --- /dev/null +++ b/src/PanelTraits/Operations.php @@ -0,0 +1,37 @@ +operation; + } + + /** + * Set the CRUD operation being performed in string form. + * + * @param string $operation_name Ex: create / update / revision / delete + */ + public function setOperation($operation_name) + { + $this->operation = $operation_name; + } +} diff --git a/src/app/Http/Controllers/Operations/Create.php b/src/app/Http/Controllers/Operations/Create.php index da21c48254..6d1c44e9e9 100644 --- a/src/app/Http/Controllers/Operations/Create.php +++ b/src/app/Http/Controllers/Operations/Create.php @@ -12,6 +12,7 @@ trait Create public function create() { $this->crud->hasAccessOrFail('create'); + $this->crud->setOperation('create'); // prepare the fields you need to show $this->data['crud'] = $this->crud; @@ -33,6 +34,7 @@ public function create() public function storeCrud(StoreRequest $request = null) { $this->crud->hasAccessOrFail('create'); + $this->crud->setOperation('create'); // fallback to global request instance if (is_null($request)) { diff --git a/src/app/Http/Controllers/Operations/Delete.php b/src/app/Http/Controllers/Operations/Delete.php index e4f88c9ea7..4e88605116 100644 --- a/src/app/Http/Controllers/Operations/Delete.php +++ b/src/app/Http/Controllers/Operations/Delete.php @@ -14,6 +14,7 @@ trait Delete public function destroy($id) { $this->crud->hasAccessOrFail('delete'); + $this->crud->setOperation('delete'); // get entry ID from Request (makes sure its the last ID for nested resources) $id = $this->crud->getCurrentEntryId() ?? $id; diff --git a/src/app/Http/Controllers/Operations/ListEntries.php b/src/app/Http/Controllers/Operations/ListEntries.php index b35ff2c38c..8797f22901 100644 --- a/src/app/Http/Controllers/Operations/ListEntries.php +++ b/src/app/Http/Controllers/Operations/ListEntries.php @@ -12,6 +12,7 @@ trait ListEntries public function index() { $this->crud->hasAccessOrFail('list'); + $this->crud->setOperation('list'); $this->data['crud'] = $this->crud; $this->data['title'] = ucfirst($this->crud->entity_name_plural); @@ -28,6 +29,7 @@ public function index() public function search() { $this->crud->hasAccessOrFail('list'); + $this->crud->setOperation('list'); $totalRows = $filteredRows = $this->crud->count(); $startIndex = $this->request->input('start') ?: 0; @@ -75,6 +77,7 @@ public function search() public function showDetailsRow($id) { $this->crud->hasAccessOrFail('details_row'); + $this->crud->setOperation('list'); // get entry ID from Request (makes sure its the last ID for nested resources) $id = $this->crud->getCurrentEntryId() ?? $id; diff --git a/src/app/Http/Controllers/Operations/Reorder.php b/src/app/Http/Controllers/Operations/Reorder.php index 561caf5fb5..d0d380794f 100644 --- a/src/app/Http/Controllers/Operations/Reorder.php +++ b/src/app/Http/Controllers/Operations/Reorder.php @@ -14,6 +14,7 @@ trait Reorder public function reorder() { $this->crud->hasAccessOrFail('reorder'); + $this->crud->setOperation('reorder'); if (! $this->crud->isReorderEnabled()) { abort(403, 'Reorder is disabled.'); @@ -38,6 +39,7 @@ public function reorder() public function saveReorder() { $this->crud->hasAccessOrFail('reorder'); + $this->crud->setOperation('reorder'); $all_entries = \Request::input('tree'); diff --git a/src/app/Http/Controllers/Operations/Revisions.php b/src/app/Http/Controllers/Operations/Revisions.php index be004c3da5..57a68378b0 100644 --- a/src/app/Http/Controllers/Operations/Revisions.php +++ b/src/app/Http/Controllers/Operations/Revisions.php @@ -14,6 +14,7 @@ trait Revisions public function listRevisions($id) { $this->crud->hasAccessOrFail('revisions'); + $this->crud->setOperation('revisions'); // get entry ID from Request (makes sure its the last ID for nested resources) $id = $this->crud->getCurrentEntryId() ?? $id; @@ -42,6 +43,7 @@ public function listRevisions($id) public function restoreRevision($id) { $this->crud->hasAccessOrFail('revisions'); + $this->crud->setOperation('revisions'); $revisionId = \Request::input('revision_id', false); if (! $revisionId) { diff --git a/src/app/Http/Controllers/Operations/Show.php b/src/app/Http/Controllers/Operations/Show.php index 7662929da0..c0d64f987c 100644 --- a/src/app/Http/Controllers/Operations/Show.php +++ b/src/app/Http/Controllers/Operations/Show.php @@ -14,6 +14,7 @@ trait Show public function show($id) { $this->crud->hasAccessOrFail('show'); + $this->crud->setOperation('show'); // get entry ID from Request (makes sure its the last ID for nested resources) $id = $this->crud->getCurrentEntryId() ?? $id; diff --git a/src/app/Http/Controllers/Operations/Update.php b/src/app/Http/Controllers/Operations/Update.php index daab4ee1d2..d199d61f9e 100644 --- a/src/app/Http/Controllers/Operations/Update.php +++ b/src/app/Http/Controllers/Operations/Update.php @@ -14,6 +14,7 @@ trait Update public function edit($id) { $this->crud->hasAccessOrFail('update'); + $this->crud->setOperation('update'); // get entry ID from Request (makes sure its the last ID for nested resources) $id = $this->crud->getCurrentEntryId() ?? $id; @@ -41,6 +42,7 @@ public function edit($id) public function updateCrud(UpdateRequest $request = null) { $this->crud->hasAccessOrFail('update'); + $this->crud->setOperation('update'); // fallback to global request instance if (is_null($request)) { From 0d9518d866f9a1477ccc4f2a9b3e427f6ee31e57 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Sun, 8 Jul 2018 10:35:35 +0300 Subject: [PATCH 010/124] Apply fixes from StyleCI (#1515) [ci skip] [skip ci] --- src/CrudPanel.php | 2 +- src/PanelTraits/Operations.php | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/CrudPanel.php b/src/CrudPanel.php index 7d17e3d1c2..a167a1a0f4 100644 --- a/src/CrudPanel.php +++ b/src/CrudPanel.php @@ -7,7 +7,6 @@ use Backpack\CRUD\PanelTraits\Query; use Backpack\CRUD\PanelTraits\Views; use Backpack\CRUD\PanelTraits\Access; -use Backpack\CRUD\PanelTraits\Operations; use Backpack\CRUD\PanelTraits\Create; use Backpack\CRUD\PanelTraits\Delete; use Backpack\CRUD\PanelTraits\Errors; @@ -21,6 +20,7 @@ use Backpack\CRUD\PanelTraits\Reorder; use Backpack\CRUD\PanelTraits\AutoFocus; use Backpack\CRUD\PanelTraits\FakeFields; +use Backpack\CRUD\PanelTraits\Operations; use Backpack\CRUD\PanelTraits\FakeColumns; use Illuminate\Database\Eloquent\Collection; use Backpack\CRUD\PanelTraits\RequiredFields; diff --git a/src/PanelTraits/Operations.php b/src/PanelTraits/Operations.php index 9fe5a1a2b5..fefc389f8a 100644 --- a/src/PanelTraits/Operations.php +++ b/src/PanelTraits/Operations.php @@ -2,8 +2,6 @@ namespace Backpack\CRUD\PanelTraits; -use Backpack\CRUD\Exception\AccessDeniedException; - trait Operations { /* From 038fc17249904dd446a87895448b495c348ead22 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Sun, 8 Jul 2018 17:49:14 +0300 Subject: [PATCH 011/124] made CrudPanel class macroable --- src/CrudPanel.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CrudPanel.php b/src/CrudPanel.php index b84595dc08..ce6511f019 100644 --- a/src/CrudPanel.php +++ b/src/CrudPanel.php @@ -21,14 +21,19 @@ use Backpack\CRUD\PanelTraits\AutoFocus; use Backpack\CRUD\PanelTraits\FakeFields; use Backpack\CRUD\PanelTraits\FakeColumns; -use Illuminate\Database\Eloquent\Collection; use Backpack\CRUD\PanelTraits\RequiredFields; use Backpack\CRUD\PanelTraits\ViewsAndRestoresRevisions; +use Illuminate\Database\Eloquent\Collection; +use Illuminate\Support\Traits\Macroable; class CrudPanel { + // load all the default CrudPanel features use Create, Read, Search, Update, Delete, Errors, Reorder, Access, Columns, Fields, Query, Buttons, AutoSet, FakeFields, FakeColumns, ViewsAndRestoresRevisions, AutoFocus, Filters, Tabs, Views, RequiredFields; + // allow developers to add their own closures to this object + use Macroable; + // -------------- // CRUD variables // -------------- From 79a058985a2c6528dd2218627b6d6ba506799da1 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Sun, 8 Jul 2018 17:49:36 +0300 Subject: [PATCH 012/124] Apply fixes from StyleCI (#1517) [ci skip] [skip ci] --- src/CrudPanel.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/CrudPanel.php b/src/CrudPanel.php index ce6511f019..a8da0a95f3 100644 --- a/src/CrudPanel.php +++ b/src/CrudPanel.php @@ -19,18 +19,17 @@ use Backpack\CRUD\PanelTraits\Filters; use Backpack\CRUD\PanelTraits\Reorder; use Backpack\CRUD\PanelTraits\AutoFocus; +use Illuminate\Support\Traits\Macroable; use Backpack\CRUD\PanelTraits\FakeFields; use Backpack\CRUD\PanelTraits\FakeColumns; +use Illuminate\Database\Eloquent\Collection; use Backpack\CRUD\PanelTraits\RequiredFields; use Backpack\CRUD\PanelTraits\ViewsAndRestoresRevisions; -use Illuminate\Database\Eloquent\Collection; -use Illuminate\Support\Traits\Macroable; class CrudPanel { // load all the default CrudPanel features use Create, Read, Search, Update, Delete, Errors, Reorder, Access, Columns, Fields, Query, Buttons, AutoSet, FakeFields, FakeColumns, ViewsAndRestoresRevisions, AutoFocus, Filters, Tabs, Views, RequiredFields; - // allow developers to add their own closures to this object use Macroable; From eae5c899252fb952edee503701056785687549be Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 10 Jul 2018 09:02:02 +0300 Subject: [PATCH 013/124] treats #1347 - custom headings and title --- src/CrudPanel.php | 3 +- src/PanelTraits/HeadingsAndTitle.php | 139 ++++++++++++++++++ .../Http/Controllers/Operations/Create.php | 2 +- .../Controllers/Operations/ListEntries.php | 2 +- .../Http/Controllers/Operations/Reorder.php | 2 +- .../Http/Controllers/Operations/Revisions.php | 2 +- src/app/Http/Controllers/Operations/Show.php | 2 +- .../Http/Controllers/Operations/Update.php | 2 +- src/resources/views/create.blade.php | 4 +- src/resources/views/edit.blade.php | 4 +- src/resources/views/list.blade.php | 4 +- src/resources/views/reorder.blade.php | 4 +- src/resources/views/revisions.blade.php | 4 +- src/resources/views/show.blade.php | 6 +- 14 files changed, 160 insertions(+), 20 deletions(-) create mode 100644 src/PanelTraits/HeadingsAndTitle.php diff --git a/src/CrudPanel.php b/src/CrudPanel.php index b84595dc08..a6f14fe004 100644 --- a/src/CrudPanel.php +++ b/src/CrudPanel.php @@ -8,6 +8,7 @@ use Backpack\CRUD\PanelTraits\Views; use Backpack\CRUD\PanelTraits\Access; use Backpack\CRUD\PanelTraits\Create; +use Backpack\CRUD\PanelTraits\HeadingsAndTitle; use Backpack\CRUD\PanelTraits\Delete; use Backpack\CRUD\PanelTraits\Errors; use Backpack\CRUD\PanelTraits\Fields; @@ -27,7 +28,7 @@ class CrudPanel { - use Create, Read, Search, Update, Delete, Errors, Reorder, Access, Columns, Fields, Query, Buttons, AutoSet, FakeFields, FakeColumns, ViewsAndRestoresRevisions, AutoFocus, Filters, Tabs, Views, RequiredFields; + use Create, Read, Search, Update, Delete, Errors, Reorder, Access, Columns, Fields, Query, Buttons, AutoSet, FakeFields, FakeColumns, ViewsAndRestoresRevisions, AutoFocus, Filters, Tabs, Views, RequiredFields, HeadingsAndTitle; // -------------- // CRUD variables diff --git a/src/PanelTraits/HeadingsAndTitle.php b/src/PanelTraits/HeadingsAndTitle.php new file mode 100644 index 0000000000..c57df85867 --- /dev/null +++ b/src/PanelTraits/HeadingsAndTitle.php @@ -0,0 +1,139 @@ +getActionMethod(); + } + + if (isset($this->titles[$action])) { + return $this->titles[$action]; + } + + if (is_string($fallback)) { + return $fallback; + } + } + + /** + * Change the title of a page for a certain controller method (action). + * + * @param string $string string to use as title + * @param string $action create / edit / reorder / etc + */ + public function setTitle($string, $action = false) + { + if (!$action) { + $action = $this->getActionMethod(); + } + + $this->titles[$action] = $string; + } + + + // ------- + // HEADING + // ------- + // The biggest heading on page (h1) + + /** + * Get the heading string for the current controller method (action). + * + * @param boolean $fallback String to return if there is no custom heading stored. + * @param boolean $action create / edit / reorder / etc + * @return string + */ + public function getHeading($fallback = false, $action = false) + { + if (!$action) { + $action = $this->getActionMethod(); + } + + if (isset($this->headings[$action])) { + return $this->headings[$action]; + } + + if (is_string($fallback)) { + return $fallback; + } + } + + /** + * Change the heading of a page for a certain controller method (action). + * + * @param string $string string to use as heading + * @param string $action create / edit / reorder / etc + */ + public function setHeading($string, $action = false) + { + if (!$action) { + $action = $this->getActionMethod(); + } + + $this->headings[$action] = $string; + } + + + // ---------- + // SUBHEADING + // ---------- + // Smaller text next to the biggest heading on page. + + /** + * Get the subheading for a certain controller method (action). + * + * @param boolean $fallback String to return if no custom subheading is present. + * @param boolean $action create / edit / reorder / etc + * @return string + */ + public function getSubheading($fallback = false, $action = false) + { + if (!$action) { + $action = $this->getActionMethod(); + } + + if (isset($this->subheadings[$action])) { + return $this->subheadings[$action]; + } + + if (is_string($fallback)) { + return $fallback; + } + } + + /** + * Change the subheading of a page for a certain controller method (action). + * + * @param string $string string to use as subheading + * @param string $action create / edit / reorder / etc + */ + public function setSubheading($string, $action = false) + { + if (!$action) { + $action = $this->getActionMethod(); + } + + $this->subheadings[$action] = $string; + } +} diff --git a/src/app/Http/Controllers/Operations/Create.php b/src/app/Http/Controllers/Operations/Create.php index 49f6fce5e5..14e93f99dc 100644 --- a/src/app/Http/Controllers/Operations/Create.php +++ b/src/app/Http/Controllers/Operations/Create.php @@ -19,7 +19,7 @@ public function create() $this->data['crud'] = $this->crud; $this->data['saveAction'] = $this->getSaveAction(); $this->data['fields'] = $this->crud->getCreateFields(); - $this->data['title'] = trans('backpack::crud.add').' '.$this->crud->entity_name; + $this->data['title'] = $this->crud->getTitle(trans('backpack::crud.add').' '.$this->crud->entity_name); // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package return view($this->crud->getCreateView(), $this->data); diff --git a/src/app/Http/Controllers/Operations/ListEntries.php b/src/app/Http/Controllers/Operations/ListEntries.php index b35ff2c38c..e7a7d597e5 100644 --- a/src/app/Http/Controllers/Operations/ListEntries.php +++ b/src/app/Http/Controllers/Operations/ListEntries.php @@ -14,7 +14,7 @@ public function index() $this->crud->hasAccessOrFail('list'); $this->data['crud'] = $this->crud; - $this->data['title'] = ucfirst($this->crud->entity_name_plural); + $this->data['title'] = $this->crud->getTitle(ucfirst($this->crud->entity_name_plural)); // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package return view($this->crud->getListView(), $this->data); diff --git a/src/app/Http/Controllers/Operations/Reorder.php b/src/app/Http/Controllers/Operations/Reorder.php index 561caf5fb5..c4a60eea00 100644 --- a/src/app/Http/Controllers/Operations/Reorder.php +++ b/src/app/Http/Controllers/Operations/Reorder.php @@ -22,7 +22,7 @@ public function reorder() // get all results for that entity $this->data['entries'] = $this->crud->getEntries(); $this->data['crud'] = $this->crud; - $this->data['title'] = trans('backpack::crud.reorder').' '.$this->crud->entity_name; + $this->data['title'] = $this->crud->getTitle(trans('backpack::crud.reorder').' '.$this->crud->entity_name); // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package return view($this->crud->getReorderView(), $this->data); diff --git a/src/app/Http/Controllers/Operations/Revisions.php b/src/app/Http/Controllers/Operations/Revisions.php index be004c3da5..80b366ee5c 100644 --- a/src/app/Http/Controllers/Operations/Revisions.php +++ b/src/app/Http/Controllers/Operations/Revisions.php @@ -21,7 +21,7 @@ public function listRevisions($id) // get the info for that entry $this->data['entry'] = $this->crud->getEntry($id); $this->data['crud'] = $this->crud; - $this->data['title'] = ucfirst($this->crud->entity_name).' '.trans('backpack::crud.revisions'); + $this->data['title'] = $this->crud->getTitle(ucfirst($this->crud->entity_name).' '.trans('backpack::crud.revisions')); $this->data['id'] = $id; $this->data['revisions'] = $this->crud->listRevisions($id); diff --git a/src/app/Http/Controllers/Operations/Show.php b/src/app/Http/Controllers/Operations/Show.php index 7662929da0..445d5fa0f2 100644 --- a/src/app/Http/Controllers/Operations/Show.php +++ b/src/app/Http/Controllers/Operations/Show.php @@ -37,7 +37,7 @@ public function show($id) // get the info for that entry $this->data['entry'] = $this->crud->getEntry($id); $this->data['crud'] = $this->crud; - $this->data['title'] = trans('backpack::crud.preview').' '.$this->crud->entity_name; + $this->data['title'] = $this->crud->getTitle(trans('backpack::crud.preview').' '.$this->crud->entity_name); // remove preview button from stack:line $this->crud->removeButton('preview'); diff --git a/src/app/Http/Controllers/Operations/Update.php b/src/app/Http/Controllers/Operations/Update.php index c63bd561e2..1364070383 100644 --- a/src/app/Http/Controllers/Operations/Update.php +++ b/src/app/Http/Controllers/Operations/Update.php @@ -25,7 +25,7 @@ public function edit($id) $this->data['crud'] = $this->crud; $this->data['saveAction'] = $this->getSaveAction(); $this->data['fields'] = $this->crud->getUpdateFields($id); - $this->data['title'] = trans('backpack::crud.edit').' '.$this->crud->entity_name; + $this->data['title'] = $this->crud->getTitle(trans('backpack::crud.edit').' '.$this->crud->entity_name); $this->data['id'] = $id; diff --git a/src/resources/views/create.blade.php b/src/resources/views/create.blade.php index 6b554b6a52..fadf57ab48 100644 --- a/src/resources/views/create.blade.php +++ b/src/resources/views/create.blade.php @@ -3,8 +3,8 @@ @section('header')

    - {{ $crud->entity_name_plural }} - {{ trans('backpack::crud.add').' '.$crud->entity_name }}. + {!! $crud->getHeading($crud->entity_name_plural) !!} + {!! $crud->getSubheading(trans('backpack::crud.add').' '.$crud->entity_name) !!}.

    1. {{ trans('backpack::crud.admin') }}
      2. diff --git a/src/resources/views/edit.blade.php b/src/resources/views/edit.blade.php index 6c1e2de149..ea0476c654 100644 --- a/src/resources/views/edit.blade.php +++ b/src/resources/views/edit.blade.php @@ -3,8 +3,8 @@ @section('header')

      - {{ $crud->entity_name_plural }} - {{ trans('backpack::crud.edit').' '.$crud->entity_name }}. + {!! $crud->getHeading($crud->entity_name_plural) !!} + {!! $crud->getSubheading(trans('backpack::crud.edit').' '.$crud->entity_name) !!}.

      1. {{ trans('backpack::crud.admin') }}
        2. diff --git a/src/resources/views/list.blade.php b/src/resources/views/list.blade.php index 6379749705..91e923a905 100644 --- a/src/resources/views/list.blade.php +++ b/src/resources/views/list.blade.php @@ -3,8 +3,8 @@ @section('header')

        - {{ $crud->entity_name_plural }} - {{ trans('backpack::crud.all') }} {{ $crud->entity_name_plural }} {{ trans('backpack::crud.in_the_database') }}. + {!! $crud->getHeading($crud->entity_name_plural) !!} + {!! $crud->getSubheading(trans('backpack::crud.all').''.$crud->entity_name_plural.' '.trans('backpack::crud.in_the_database')) !!}.

        1. {{ trans('backpack::crud.admin') }}
          2. diff --git a/src/resources/views/reorder.blade.php b/src/resources/views/reorder.blade.php index de77eabfc4..2a564fc8ff 100644 --- a/src/resources/views/reorder.blade.php +++ b/src/resources/views/reorder.blade.php @@ -3,8 +3,8 @@ @section('header')

          - {{ $crud->entity_name_plural }} - {{ trans('backpack::crud.reorder').' '.$crud->entity_name_plural }}. + {!! $crud->getHeading($crud->entity_name_plural) !!} + {!! $crud->getSubheading(trans('backpack::crud.reorder').' '.$crud->entity_name_plural) !!}.

          1. {{ trans('backpack::crud.admin') }}
            2. diff --git a/src/resources/views/revisions.blade.php b/src/resources/views/revisions.blade.php index 0fbd37a983..f88ab0a4b6 100644 --- a/src/resources/views/revisions.blade.php +++ b/src/resources/views/revisions.blade.php @@ -3,8 +3,8 @@ @section('header')

            - {{ $crud->entity_name_plural }} - {{ trans('backpack::crud.revisions') }}. + {!! $crud->getHeading($crud->entity_name_plural) !!} + {!! $crud->getSubheading(trans('backpack::crud.revisions')) !!}.

            1. {{ trans('backpack::crud.admin') }}
              2. diff --git a/src/resources/views/show.blade.php b/src/resources/views/show.blade.php index 1cca93522b..371b564c14 100644 --- a/src/resources/views/show.blade.php +++ b/src/resources/views/show.blade.php @@ -1,10 +1,10 @@ @extends('backpack::layout') -@section('content-header') +@section('header')

              - {{ $crud->entity_name_plural }} - {{ ucfirst(trans('backpack::crud.preview')).' '.$crud->entity_name }}. + {!! $crud->getHeading($crud->entity_name_plural) !!} + {!! $crud->getSubheading(ucfirst(trans('backpack::crud.preview')).' '.$crud->entity_name) !!}.

              1. {{ trans('backpack::crud.admin') }}
                2. From 432f5627522000892c7b96700f238cf8cdee5840 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 10 Jul 2018 09:02:26 +0300 Subject: [PATCH 014/124] Apply fixes from StyleCI (#1526) [ci skip] [skip ci] --- src/CrudPanel.php | 2 +- src/PanelTraits/HeadingsAndTitle.php | 27 ++++++++++++--------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/CrudPanel.php b/src/CrudPanel.php index a6f14fe004..23dc8c12f5 100644 --- a/src/CrudPanel.php +++ b/src/CrudPanel.php @@ -8,7 +8,6 @@ use Backpack\CRUD\PanelTraits\Views; use Backpack\CRUD\PanelTraits\Access; use Backpack\CRUD\PanelTraits\Create; -use Backpack\CRUD\PanelTraits\HeadingsAndTitle; use Backpack\CRUD\PanelTraits\Delete; use Backpack\CRUD\PanelTraits\Errors; use Backpack\CRUD\PanelTraits\Fields; @@ -24,6 +23,7 @@ use Backpack\CRUD\PanelTraits\FakeColumns; use Illuminate\Database\Eloquent\Collection; use Backpack\CRUD\PanelTraits\RequiredFields; +use Backpack\CRUD\PanelTraits\HeadingsAndTitle; use Backpack\CRUD\PanelTraits\ViewsAndRestoresRevisions; class CrudPanel diff --git a/src/PanelTraits/HeadingsAndTitle.php b/src/PanelTraits/HeadingsAndTitle.php index c57df85867..3683af5e7c 100644 --- a/src/PanelTraits/HeadingsAndTitle.php +++ b/src/PanelTraits/HeadingsAndTitle.php @@ -8,7 +8,6 @@ trait HeadingsAndTitle public $headings = []; public $subheadings = []; - // ----- // TITLE // ----- @@ -17,13 +16,13 @@ trait HeadingsAndTitle /** * Get the title string for the current controller method (action). * - * @param boolean $fallback String to return if there is no custom title stored. - * @param boolean $action create / edit / reorder / etc + * @param bool $fallback String to return if there is no custom title stored. + * @param bool $action create / edit / reorder / etc * @return string */ public function getTitle($fallback = false, $action = false) { - if (!$action) { + if (! $action) { $action = $this->getActionMethod(); } @@ -44,14 +43,13 @@ public function getTitle($fallback = false, $action = false) */ public function setTitle($string, $action = false) { - if (!$action) { + if (! $action) { $action = $this->getActionMethod(); } $this->titles[$action] = $string; } - // ------- // HEADING // ------- @@ -60,13 +58,13 @@ public function setTitle($string, $action = false) /** * Get the heading string for the current controller method (action). * - * @param boolean $fallback String to return if there is no custom heading stored. - * @param boolean $action create / edit / reorder / etc + * @param bool $fallback String to return if there is no custom heading stored. + * @param bool $action create / edit / reorder / etc * @return string */ public function getHeading($fallback = false, $action = false) { - if (!$action) { + if (! $action) { $action = $this->getActionMethod(); } @@ -87,14 +85,13 @@ public function getHeading($fallback = false, $action = false) */ public function setHeading($string, $action = false) { - if (!$action) { + if (! $action) { $action = $this->getActionMethod(); } $this->headings[$action] = $string; } - // ---------- // SUBHEADING // ---------- @@ -103,13 +100,13 @@ public function setHeading($string, $action = false) /** * Get the subheading for a certain controller method (action). * - * @param boolean $fallback String to return if no custom subheading is present. - * @param boolean $action create / edit / reorder / etc + * @param bool $fallback String to return if no custom subheading is present. + * @param bool $action create / edit / reorder / etc * @return string */ public function getSubheading($fallback = false, $action = false) { - if (!$action) { + if (! $action) { $action = $this->getActionMethod(); } @@ -130,7 +127,7 @@ public function getSubheading($fallback = false, $action = false) */ public function setSubheading($string, $action = false) { - if (!$action) { + if (! $action) { $action = $this->getActionMethod(); } From 189c970541207bc886b5537b06d7d64255da5d29 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 10 Jul 2018 09:32:31 +0300 Subject: [PATCH 015/124] removed fallback from getTitle getHeading and getSubheading --- src/PanelTraits/HeadingsAndTitle.php | 21 +++---------------- .../Http/Controllers/Operations/Create.php | 2 +- .../Controllers/Operations/ListEntries.php | 2 +- .../Http/Controllers/Operations/Reorder.php | 2 +- .../Http/Controllers/Operations/Revisions.php | 2 +- src/app/Http/Controllers/Operations/Show.php | 2 +- .../Http/Controllers/Operations/Update.php | 2 +- src/resources/views/create.blade.php | 4 ++-- src/resources/views/edit.blade.php | 4 ++-- src/resources/views/list.blade.php | 4 ++-- src/resources/views/reorder.blade.php | 4 ++-- src/resources/views/revisions.blade.php | 4 ++-- src/resources/views/show.blade.php | 4 ++-- 13 files changed, 21 insertions(+), 36 deletions(-) diff --git a/src/PanelTraits/HeadingsAndTitle.php b/src/PanelTraits/HeadingsAndTitle.php index c57df85867..7c3f28f9ae 100644 --- a/src/PanelTraits/HeadingsAndTitle.php +++ b/src/PanelTraits/HeadingsAndTitle.php @@ -17,11 +17,10 @@ trait HeadingsAndTitle /** * Get the title string for the current controller method (action). * - * @param boolean $fallback String to return if there is no custom title stored. * @param boolean $action create / edit / reorder / etc * @return string */ - public function getTitle($fallback = false, $action = false) + public function getTitle($action = false) { if (!$action) { $action = $this->getActionMethod(); @@ -30,10 +29,6 @@ public function getTitle($fallback = false, $action = false) if (isset($this->titles[$action])) { return $this->titles[$action]; } - - if (is_string($fallback)) { - return $fallback; - } } /** @@ -60,11 +55,10 @@ public function setTitle($string, $action = false) /** * Get the heading string for the current controller method (action). * - * @param boolean $fallback String to return if there is no custom heading stored. * @param boolean $action create / edit / reorder / etc * @return string */ - public function getHeading($fallback = false, $action = false) + public function getHeading($action = false) { if (!$action) { $action = $this->getActionMethod(); @@ -73,10 +67,6 @@ public function getHeading($fallback = false, $action = false) if (isset($this->headings[$action])) { return $this->headings[$action]; } - - if (is_string($fallback)) { - return $fallback; - } } /** @@ -103,11 +93,10 @@ public function setHeading($string, $action = false) /** * Get the subheading for a certain controller method (action). * - * @param boolean $fallback String to return if no custom subheading is present. * @param boolean $action create / edit / reorder / etc * @return string */ - public function getSubheading($fallback = false, $action = false) + public function getSubheading($action = false) { if (!$action) { $action = $this->getActionMethod(); @@ -116,10 +105,6 @@ public function getSubheading($fallback = false, $action = false) if (isset($this->subheadings[$action])) { return $this->subheadings[$action]; } - - if (is_string($fallback)) { - return $fallback; - } } /** diff --git a/src/app/Http/Controllers/Operations/Create.php b/src/app/Http/Controllers/Operations/Create.php index 14e93f99dc..1d42cd1e86 100644 --- a/src/app/Http/Controllers/Operations/Create.php +++ b/src/app/Http/Controllers/Operations/Create.php @@ -19,7 +19,7 @@ public function create() $this->data['crud'] = $this->crud; $this->data['saveAction'] = $this->getSaveAction(); $this->data['fields'] = $this->crud->getCreateFields(); - $this->data['title'] = $this->crud->getTitle(trans('backpack::crud.add').' '.$this->crud->entity_name); + $this->data['title'] = $this->crud->getTitle() ?? trans('backpack::crud.add').' '.$this->crud->entity_name; // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package return view($this->crud->getCreateView(), $this->data); diff --git a/src/app/Http/Controllers/Operations/ListEntries.php b/src/app/Http/Controllers/Operations/ListEntries.php index e7a7d597e5..ae09f01e99 100644 --- a/src/app/Http/Controllers/Operations/ListEntries.php +++ b/src/app/Http/Controllers/Operations/ListEntries.php @@ -14,7 +14,7 @@ public function index() $this->crud->hasAccessOrFail('list'); $this->data['crud'] = $this->crud; - $this->data['title'] = $this->crud->getTitle(ucfirst($this->crud->entity_name_plural)); + $this->data['title'] = $this->crud->getTitle() ?? ucfirst($this->crud->entity_name_plural); // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package return view($this->crud->getListView(), $this->data); diff --git a/src/app/Http/Controllers/Operations/Reorder.php b/src/app/Http/Controllers/Operations/Reorder.php index c4a60eea00..71fc91c0a7 100644 --- a/src/app/Http/Controllers/Operations/Reorder.php +++ b/src/app/Http/Controllers/Operations/Reorder.php @@ -22,7 +22,7 @@ public function reorder() // get all results for that entity $this->data['entries'] = $this->crud->getEntries(); $this->data['crud'] = $this->crud; - $this->data['title'] = $this->crud->getTitle(trans('backpack::crud.reorder').' '.$this->crud->entity_name); + $this->data['title'] = $this->crud->getTitle() ?? trans('backpack::crud.reorder').' '.$this->crud->entity_name; // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package return view($this->crud->getReorderView(), $this->data); diff --git a/src/app/Http/Controllers/Operations/Revisions.php b/src/app/Http/Controllers/Operations/Revisions.php index 80b366ee5c..9eed79a867 100644 --- a/src/app/Http/Controllers/Operations/Revisions.php +++ b/src/app/Http/Controllers/Operations/Revisions.php @@ -21,7 +21,7 @@ public function listRevisions($id) // get the info for that entry $this->data['entry'] = $this->crud->getEntry($id); $this->data['crud'] = $this->crud; - $this->data['title'] = $this->crud->getTitle(ucfirst($this->crud->entity_name).' '.trans('backpack::crud.revisions')); + $this->data['title'] = $this->crud->getTitle() ?? ucfirst($this->crud->entity_name).' '.trans('backpack::crud.revisions'); $this->data['id'] = $id; $this->data['revisions'] = $this->crud->listRevisions($id); diff --git a/src/app/Http/Controllers/Operations/Show.php b/src/app/Http/Controllers/Operations/Show.php index 445d5fa0f2..a7c9cbe57d 100644 --- a/src/app/Http/Controllers/Operations/Show.php +++ b/src/app/Http/Controllers/Operations/Show.php @@ -37,7 +37,7 @@ public function show($id) // get the info for that entry $this->data['entry'] = $this->crud->getEntry($id); $this->data['crud'] = $this->crud; - $this->data['title'] = $this->crud->getTitle(trans('backpack::crud.preview').' '.$this->crud->entity_name); + $this->data['title'] = $this->crud->getTitle() ?? trans('backpack::crud.preview').' '.$this->crud->entity_name; // remove preview button from stack:line $this->crud->removeButton('preview'); diff --git a/src/app/Http/Controllers/Operations/Update.php b/src/app/Http/Controllers/Operations/Update.php index 1364070383..7bcb464ede 100644 --- a/src/app/Http/Controllers/Operations/Update.php +++ b/src/app/Http/Controllers/Operations/Update.php @@ -25,7 +25,7 @@ public function edit($id) $this->data['crud'] = $this->crud; $this->data['saveAction'] = $this->getSaveAction(); $this->data['fields'] = $this->crud->getUpdateFields($id); - $this->data['title'] = $this->crud->getTitle(trans('backpack::crud.edit').' '.$this->crud->entity_name); + $this->data['title'] = $this->crud->getTitle() ?? trans('backpack::crud.edit').' '.$this->crud->entity_name; $this->data['id'] = $id; diff --git a/src/resources/views/create.blade.php b/src/resources/views/create.blade.php index fadf57ab48..76d161772d 100644 --- a/src/resources/views/create.blade.php +++ b/src/resources/views/create.blade.php @@ -3,8 +3,8 @@ @section('header')

                - {!! $crud->getHeading($crud->entity_name_plural) !!} - {!! $crud->getSubheading(trans('backpack::crud.add').' '.$crud->entity_name) !!}. + {!! $crud->getHeading() ?? $crud->entity_name_plural !!} + {!! $crud->getSubheading() ?? trans('backpack::crud.add').' '.$crud->entity_name !!}.

                1. {{ trans('backpack::crud.admin') }}
                  2. diff --git a/src/resources/views/edit.blade.php b/src/resources/views/edit.blade.php index ea0476c654..afc76cea63 100644 --- a/src/resources/views/edit.blade.php +++ b/src/resources/views/edit.blade.php @@ -3,8 +3,8 @@ @section('header')

                  - {!! $crud->getHeading($crud->entity_name_plural) !!} - {!! $crud->getSubheading(trans('backpack::crud.edit').' '.$crud->entity_name) !!}. + {!! $crud->getHeading() ?? $crud->entity_name_plural !!} + {!! $crud->getSubheading() ?? trans('backpack::crud.edit').' '.$crud->entity_name !!}.

                  1. {{ trans('backpack::crud.admin') }}
                    2. diff --git a/src/resources/views/list.blade.php b/src/resources/views/list.blade.php index 91e923a905..d69a4a1297 100644 --- a/src/resources/views/list.blade.php +++ b/src/resources/views/list.blade.php @@ -3,8 +3,8 @@ @section('header')

                    - {!! $crud->getHeading($crud->entity_name_plural) !!} - {!! $crud->getSubheading(trans('backpack::crud.all').''.$crud->entity_name_plural.' '.trans('backpack::crud.in_the_database')) !!}. + {!! $crud->getHeading() ?? $crud->entity_name_plural !!} + {!! $crud->getSubheading() ?? trans('backpack::crud.all').''.$crud->entity_name_plural.' '.trans('backpack::crud.in_the_database') !!}.

                    1. {{ trans('backpack::crud.admin') }}
                      2. diff --git a/src/resources/views/reorder.blade.php b/src/resources/views/reorder.blade.php index 2a564fc8ff..2335c2f22c 100644 --- a/src/resources/views/reorder.blade.php +++ b/src/resources/views/reorder.blade.php @@ -3,8 +3,8 @@ @section('header')

                      - {!! $crud->getHeading($crud->entity_name_plural) !!} - {!! $crud->getSubheading(trans('backpack::crud.reorder').' '.$crud->entity_name_plural) !!}. + {!! $crud->getHeading() ?? $crud->entity_name_plural !!} + {!! $crud->getSubheading() ?? trans('backpack::crud.reorder').' '.$crud->entity_name_plural !!}.

                      1. {{ trans('backpack::crud.admin') }}
                        2. diff --git a/src/resources/views/revisions.blade.php b/src/resources/views/revisions.blade.php index f88ab0a4b6..d10d9ca494 100644 --- a/src/resources/views/revisions.blade.php +++ b/src/resources/views/revisions.blade.php @@ -3,8 +3,8 @@ @section('header')

                        - {!! $crud->getHeading($crud->entity_name_plural) !!} - {!! $crud->getSubheading(trans('backpack::crud.revisions')) !!}. + {!! $crud->getHeading() ?? $crud->entity_name_plural !!} + {!! $crud->getSubheading() ?? trans('backpack::crud.revisions') !!}.

                        1. {{ trans('backpack::crud.admin') }}
                          2. diff --git a/src/resources/views/show.blade.php b/src/resources/views/show.blade.php index 371b564c14..07cf16f8fa 100644 --- a/src/resources/views/show.blade.php +++ b/src/resources/views/show.blade.php @@ -3,8 +3,8 @@ @section('header')

                          - {!! $crud->getHeading($crud->entity_name_plural) !!} - {!! $crud->getSubheading(ucfirst(trans('backpack::crud.preview')).' '.$crud->entity_name) !!}. + {!! $crud->getHeading() ?? $crud->entity_name_plural !!} + {!! $crud->getSubheading() ?? ucfirst(trans('backpack::crud.preview')).' '.$crud->entity_name !!}.

                          1. {{ trans('backpack::crud.admin') }}
                            2. From 4e27b271d28227e4da8af0f4029408fb18d4f79d Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 10 Jul 2018 09:35:49 +0300 Subject: [PATCH 016/124] Apply fixes from StyleCI (#1528) [ci skip] [skip ci] --- src/PanelTraits/HeadingsAndTitle.php | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/PanelTraits/HeadingsAndTitle.php b/src/PanelTraits/HeadingsAndTitle.php index 7c3f28f9ae..6726c20e1b 100644 --- a/src/PanelTraits/HeadingsAndTitle.php +++ b/src/PanelTraits/HeadingsAndTitle.php @@ -8,7 +8,6 @@ trait HeadingsAndTitle public $headings = []; public $subheadings = []; - // ----- // TITLE // ----- @@ -17,12 +16,12 @@ trait HeadingsAndTitle /** * Get the title string for the current controller method (action). * - * @param boolean $action create / edit / reorder / etc + * @param bool $action create / edit / reorder / etc * @return string */ public function getTitle($action = false) { - if (!$action) { + if (! $action) { $action = $this->getActionMethod(); } @@ -39,14 +38,13 @@ public function getTitle($action = false) */ public function setTitle($string, $action = false) { - if (!$action) { + if (! $action) { $action = $this->getActionMethod(); } $this->titles[$action] = $string; } - // ------- // HEADING // ------- @@ -55,12 +53,12 @@ public function setTitle($string, $action = false) /** * Get the heading string for the current controller method (action). * - * @param boolean $action create / edit / reorder / etc + * @param bool $action create / edit / reorder / etc * @return string */ public function getHeading($action = false) { - if (!$action) { + if (! $action) { $action = $this->getActionMethod(); } @@ -77,14 +75,13 @@ public function getHeading($action = false) */ public function setHeading($string, $action = false) { - if (!$action) { + if (! $action) { $action = $this->getActionMethod(); } $this->headings[$action] = $string; } - // ---------- // SUBHEADING // ---------- @@ -93,12 +90,12 @@ public function setHeading($string, $action = false) /** * Get the subheading for a certain controller method (action). * - * @param boolean $action create / edit / reorder / etc + * @param bool $action create / edit / reorder / etc * @return string */ public function getSubheading($action = false) { - if (!$action) { + if (! $action) { $action = $this->getActionMethod(); } @@ -115,7 +112,7 @@ public function getSubheading($action = false) */ public function setSubheading($string, $action = false) { - if (!$action) { + if (! $action) { $action = $this->getActionMethod(); } From 8f5ca734d5eac977529a9dffcb8a00e6466360bf Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Wed, 11 Jul 2018 12:44:20 +0300 Subject: [PATCH 017/124] fixes #1416 --- src/PanelTraits/Query.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/PanelTraits/Query.php b/src/PanelTraits/Query.php index dee473c54d..f9bfb568d8 100644 --- a/src/PanelTraits/Query.php +++ b/src/PanelTraits/Query.php @@ -50,6 +50,11 @@ public function with($entities) */ public function orderBy($field, $order = 'asc') { + if ($this->request->has('order')) + { + return $this->query; + } + return $this->query->orderBy($field, $order); } From e9d155be9156f96c343a8cb809201505719d905c Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Wed, 11 Jul 2018 12:44:43 +0300 Subject: [PATCH 018/124] Apply fixes from StyleCI (#1534) [ci skip] [skip ci] --- src/PanelTraits/Query.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/PanelTraits/Query.php b/src/PanelTraits/Query.php index f9bfb568d8..b61106d3e8 100644 --- a/src/PanelTraits/Query.php +++ b/src/PanelTraits/Query.php @@ -50,8 +50,7 @@ public function with($entities) */ public function orderBy($field, $order = 'asc') { - if ($this->request->has('order')) - { + if ($this->request->has('order')) { return $this->query; } From f4151e8d74fa9a260eaa3a7e748b4b486bfc1ae1 Mon Sep 17 00:00:00 2001 From: Alan Brande Date: Thu, 12 Jul 2018 18:52:10 -0300 Subject: [PATCH 019/124] Changed Google address field to read API key from crud config file --- src/config/backpack/crud.php | 8 ++++++++ src/resources/views/fields/address_google.blade.php | 10 ++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/config/backpack/crud.php b/src/config/backpack/crud.php index 9b4951b8a6..c2e134306e 100644 --- a/src/config/backpack/crud.php +++ b/src/config/backpack/crud.php @@ -65,6 +65,14 @@ |------------ */ + /* + |------------ + | API KEYS + |------------ + */ + + 'google_places_api_key' => env('GOOGLE_PLACES_API_KEY'), //Only needed if you use the address_google field + /* |------------------- | TRANSLATABLE CRUDS diff --git a/src/resources/views/fields/address_google.blade.php b/src/resources/views/fields/address_google.blade.php index acfeb53edb..678da664ba 100644 --- a/src/resources/views/fields/address_google.blade.php +++ b/src/resources/views/fields/address_google.blade.php @@ -97,19 +97,25 @@ function initAutocomplete() { for (var i = 0; i < place.address_components.length; i++) { var addressType = place.address_components[i].types[0]; - data[addressType] = place.address_components[i]['long_name']; + data[addressType] = place.address_components[i]['long_name']; } $field.val(JSON.stringify(data)); }); + $this.change(function(){ + if (!$this.val().length) { + $field.val(""); + } + }); + }); } - @endpush From aa4d6bbaf27aa033c4d21e54157f77dded39303b Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Fri, 10 Aug 2018 10:32:28 +0300 Subject: [PATCH 020/124] bumped version --- CHANGELOG.md | 2 +- src/CrudServiceProvider.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb20d17bc6..af24b10639 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,7 @@ All Notable changes to `Backpack CRUD` will be documented in this file - Nothing ----------- -## [3.4.30] - 2018-08-xx +## [3.4.30] - 2018-08-10 ### Added - #1589 - ```upload_multiple``` column type; diff --git a/src/CrudServiceProvider.php b/src/CrudServiceProvider.php index 9749431046..8581ae35df 100644 --- a/src/CrudServiceProvider.php +++ b/src/CrudServiceProvider.php @@ -9,7 +9,7 @@ class CrudServiceProvider extends ServiceProvider { use CrudUsageStats; - const VERSION = '3.4.28'; + const VERSION = '3.4.30'; protected $commands = [ \Backpack\CRUD\app\Console\Commands\Install::class, From adf9637c20ded58a795de98c41747e65f5f031be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joa=CC=83o=20Joyce?= Date: Mon, 3 Sep 2018 16:41:37 +0100 Subject: [PATCH 021/124] Added a field that enables the selection and ordering of an array. --- .../views/fields/select_and_order.blade.php | 126 ++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 src/resources/views/fields/select_and_order.blade.php diff --git a/src/resources/views/fields/select_and_order.blade.php b/src/resources/views/fields/select_and_order.blade.php new file mode 100644 index 0000000000..bd53148585 --- /dev/null +++ b/src/resources/views/fields/select_and_order.blade.php @@ -0,0 +1,126 @@ + +@php + $values = (array) $field['value']; +@endphp +
                            + + @include('crud::inc.field_translatable_icon') +
                            +
                              + @if(old($field["name"])) + @foreach ($field['options'] as $key => $value) + @if(!is_array(old($field["name"])) || !in_array($key, old($field["name"]))) +
                            • {{ $value }}
                              • + @endif + @endforeach + @elseif (isset($field['options'])) + @foreach ($field['options'] as $key => $value) + @if(is_array($values) && !in_array($key, $values)) +
                            • {{ $value }}
                              • + @endif + @endforeach + @endif +
                            +
                              + @if(old($field["name"])) + @if(is_array(old($field["name"]))) + @foreach (old($field["name"]) as $key) + @if(array_key_exists($key,$field['options'])) +
                            • {{ $field['options'][$key] }}
                              • + @endif + @endforeach + @endif + @elseif (is_array($values)) + @foreach ($values as $key) + @if(array_key_exists($key,$field['options'])) +
                            • {{ $field['options'][$key] }}
                              • + @endif + @endforeach + @endif +
                            + + {{-- The results will be stored here --}} +
                            +
                            + + + + {{-- HINT --}} + @if (isset($field['hint'])) +

                            {!! $field['hint'] !!}

                            + @endif +
                            + + +{{-- ########################################## --}} +{{-- Extra CSS and JS for this particular field --}} +{{-- If a field type is shown multiple times on a form, the CSS and JS will only be loaded once --}} +@if ($crud->checkIfFieldIsFirstOfItsType($field, $fields)) + + {{-- FIELD CSS - will be loaded in the after_styles section --}} + @push('crud_fields_styles') + + @endpush + + @push('crud_fields_scripts') + + @endpush + +@endif + +{{-- FIELD JS - will be loaded in the after_scripts section --}} +@push('crud_fields_scripts') + +@endpush + +{{-- End of Extra CSS and JS --}} +{{-- ########################################## --}} From e580989f173b4facb3502f3a17210f463974b3e9 Mon Sep 17 00:00:00 2001 From: pestopancake Date: Thu, 4 Oct 2018 14:56:11 +0100 Subject: [PATCH 022/124] use dot notation when getting old value (example on only text field) Allows array fields to keep their value when validation fails. Fields named foo[0][bar], for example, will be converted to foo.0.bar when looking up old value (old() doesn't understand square brackets). --- src/resources/views/fields/text.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resources/views/fields/text.blade.php b/src/resources/views/fields/text.blade.php index 75181a466d..4873175561 100644 --- a/src/resources/views/fields/text.blade.php +++ b/src/resources/views/fields/text.blade.php @@ -8,7 +8,7 @@ @if(isset($field['suffix']))
                            {!! $field['suffix'] !!}
                            @endif @@ -37,4 +37,4 @@ @endpush --}} -{{-- Note: you can use @if ($crud->checkIfFieldIsFirstOfItsType($field, $fields)) to only load some CSS/JS once, even though there are multiple instances of it --}} \ No newline at end of file +{{-- Note: you can use @if ($crud->checkIfFieldIsFirstOfItsType($field, $fields)) to only load some CSS/JS once, even though there are multiple instances of it --}} From 21652b05d292f7fef74e2fa59f29d62e3e385319 Mon Sep 17 00:00:00 2001 From: aand18 <36073609+aand18@users.noreply.github.com> Date: Mon, 15 Oct 2018 16:36:13 +0200 Subject: [PATCH 023/124] Fix access to $crud in button from model function If stack is 'line' and button type is 'model_function' you don't have access to the `$crud` object. I think it's wrong anyway because we're calling the same method with two different parameter types: line 5 `$entry->{$button->content}($entry)` <-- here we won't have `$crud` available to the method; instead `$entry` is unnecessarily passed as parameter, it will be available implicitly as `$this` and line 7 `$crud->model->{$button->content}($crud)` --- src/resources/views/inc/button_stack.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resources/views/inc/button_stack.blade.php b/src/resources/views/inc/button_stack.blade.php index f7fc7ce155..1acbb26047 100644 --- a/src/resources/views/inc/button_stack.blade.php +++ b/src/resources/views/inc/button_stack.blade.php @@ -2,7 +2,7 @@ @foreach ($crud->buttons->where('stack', $stack) as $button) @if ($button->type == 'model_function') @if ($stack == 'line') - {!! $entry->{$button->content}($entry); !!} + {!! $entry->{$button->content}($crud); !!} @else {!! $crud->model->{$button->content}($crud); !!} @endif From 15e65c40545a32626bf43cc6db19c7e613dfc692 Mon Sep 17 00:00:00 2001 From: Thomas Swonke Date: Tue, 16 Oct 2018 10:52:49 +0200 Subject: [PATCH 024/124] add option to override the content class of list/create/edit --- src/PanelTraits/Views.php | 59 +++++++++++++++++++++++++++- src/config/backpack/crud.php | 12 ++++++ src/resources/views/create.blade.php | 2 +- src/resources/views/edit.blade.php | 2 +- src/resources/views/list.blade.php | 2 +- 5 files changed, 73 insertions(+), 4 deletions(-) diff --git a/src/PanelTraits/Views.php b/src/PanelTraits/Views.php index c762f5b084..f1c9d6c954 100644 --- a/src/PanelTraits/Views.php +++ b/src/PanelTraits/Views.php @@ -12,13 +12,16 @@ trait Views protected $revisionsTimelineView = 'crud::inc.revision_timeline'; protected $reorderView = 'crud::reorder'; protected $listView = 'crud::list'; + protected $createContentClass; + protected $editContentClass; + protected $listContentClass; // ------- // CREATE // ------- /** - * Sets the list template. + * Sets the create template. * * @param string $view name of the template file * @@ -40,6 +43,24 @@ public function getCreateView() return $this->createView; } + /** + * Sets the create content class. + * @param string $createContentClass content class + */ + public function setCreateContentClass(string $createContentClass) + { + $this->createContentClass = $createContentClass; + } + + /** + * Gets the create content class. + * @return string content class for create view + */ + public function getCreateContentClass() + { + return $this->createContentClass ?? config('backpack.crud.create_content_class', 'col-md-8 col-md-offset-2'); + } + // ------- // READ // ------- @@ -67,6 +88,24 @@ public function getListView() return $this->listView; } + /** + * Sets the list content class. + * @param string $listContentClass content class + */ + public function setListContentClass(string $listContentClass) + { + $this->listContentClass = $listContentClass; + } + + /** + * Gets the list content class. + * @return string content class for list view + */ + public function getListContentClass() + { + return $this->listContentClass ?? config('backpack.crud.list_content_class', 'col-md-12'); + } + /** * Sets the details row template. * @@ -140,6 +179,24 @@ public function getEditView() return $this->editView; } + /** + * Sets the edit content class. + * @param string $editContentClass content class + */ + public function setEditContentClass(string $editContentClass) + { + $this->editContentClass = $editContentClass; + } + + /** + * Gets the edit content class. + * @return string content class for edit view + */ + public function getEditContentClass() + { + return $this->editContentClass ?? config('backpack.crud.edit_content_class', 'col-md-8 col-md-offset-2'); + } + /** * Sets the reorder template. * diff --git a/src/config/backpack/crud.php b/src/config/backpack/crud.php index 47a1841295..bb7a19a4fe 100644 --- a/src/config/backpack/crud.php +++ b/src/config/backpack/crud.php @@ -27,6 +27,14 @@ 'show_grouped_errors' => true, 'show_inline_errors' => true, + // Here you may override the css-classes for the content section of the create view globally + // To override per view use $this->crud->setCreateContentClass('class-string') + 'create_content_class' => 'col-md-8 col-md-offset-2', + + // Here you may override the css-classes for the content section of the edit view globally + // To override per view use $this->crud->setEditContentClass('class-string') + 'edit_content_class' => 'col-md-8 col-md-offset-2', + /* |------------ | READ @@ -49,6 +57,10 @@ // If a 2D array is used, strings in the right hand array will be automatically run through trans() 'page_length_menu' => [[10, 25, 50, 100, -1], [10, 25, 50, 100, 'backpack::crud.all']], + // Here you may override the css-class for the content section of the list view globally + // To override per view use $this->crud->setListContentClass('class-string') + 'list_content_class' => 'col-md-12', + // PREVIEW /* diff --git a/src/resources/views/create.blade.php b/src/resources/views/create.blade.php index 6b554b6a52..4d9a72b8da 100644 --- a/src/resources/views/create.blade.php +++ b/src/resources/views/create.blade.php @@ -16,7 +16,7 @@ @section('content')
                            -
                            +
                            @if ($crud->hasAccess('list')) {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }}

                            diff --git a/src/resources/views/edit.blade.php b/src/resources/views/edit.blade.php index 6c1e2de149..c185655196 100644 --- a/src/resources/views/edit.blade.php +++ b/src/resources/views/edit.blade.php @@ -16,7 +16,7 @@ @section('content')
                            -
                            +
                            @if ($crud->hasAccess('list')) {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }}

                            diff --git a/src/resources/views/list.blade.php b/src/resources/views/list.blade.php index db0f74a0ff..a9e5f53b33 100644 --- a/src/resources/views/list.blade.php +++ b/src/resources/views/list.blade.php @@ -19,7 +19,7 @@
                            -
                            +
                            @if ( $crud->buttons->where('stack', 'top')->count() || $crud->exportButtons())
                            From b905f5c008aff238abe8b574092b8df498308f66 Mon Sep 17 00:00:00 2001 From: bl8m Date: Wed, 31 Oct 2018 11:47:57 +0100 Subject: [PATCH 025/124] Pass parameters to column function Added a new option "function_parameters" for addColumn used for passing parameters (that aren't row fields) to the model function. Example: $this->crud->addColumn([ 'name' => "district_id", 'label' => "District", 'type' => "model_function_attribute", 'function_name' => 'getDistrictsByAreaId', // the method in your Model 'function_parameters' => [2], // used by model function getDistrictsByAreaId($area_id) ]); --- .../views/columns/model_function_attribute.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resources/views/columns/model_function_attribute.blade.php b/src/resources/views/columns/model_function_attribute.blade.php index 95fc142f8a..d5e1aafadf 100644 --- a/src/resources/views/columns/model_function_attribute.blade.php +++ b/src/resources/views/columns/model_function_attribute.blade.php @@ -1,7 +1,7 @@ {{-- custom return value via attribute --}} @php - $value = $entry->{$column['function_name']}()->{$column['attribute']}; + $value = @$entry->{$column['function_name']}(...($column['function_parameters']?:[])) @endphp {{ (array_key_exists('prefix', $column) ? $column['prefix'] : '').str_limit($value, array_key_exists('limit', $column) ? $column['limit'] : 50, "[...]").(array_key_exists('suffix', $column) ? $column['suffix'] : '') }} - \ No newline at end of file + From 819f23624e958e83fbb8565eef4f354d81215772 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Wed, 31 Oct 2018 15:38:01 +0200 Subject: [PATCH 026/124] polished list view so information takes center-stage --- src/public/crud/css/list.css | 52 +++++++++++++++++++ .../views/inc/datatables_logic.blade.php | 14 +++-- .../views/inc/export_buttons.blade.php | 16 +++--- .../views/inc/filters_navbar.blade.php | 11 ++-- src/resources/views/list.blade.php | 35 ++++++++----- 5 files changed, 98 insertions(+), 30 deletions(-) diff --git a/src/public/crud/css/list.css b/src/public/crud/css/list.css index f6f358a3fe..53ffd13c2e 100644 --- a/src/public/crud/css/list.css +++ b/src/public/crud/css/list.css @@ -33,6 +33,12 @@ /*overflow: hidden;*/ } + #crudTable_wrapper #crudTable { + margin-top: 0px!important; + } + + /* DataTables Loading State Visual Improvements */ + #crudTable.dataTable.dtr-inline.collapsed>tbody>tr[role="row"]>td:first-child:before, #crudTable.dataTable.dtr-inline.collapsed>tbody>tr[role="row"]>th:first-child:before { background-color: transparent; @@ -65,4 +71,50 @@ div.dataTables_wrapper div.dataTables_length select { width: auto; + } + + .pagination>li>a { + background: transparent; + border: none; + border-radius: 25px; + color: #333; + } + + .pagination>.disabled>a, + .pagination>.disabled>a:focus, + .pagination>.disabled>a:hover, + .pagination>.disabled>span, + .pagination>.disabled>span:focus, + .pagination>.disabled>span:hover { + background: transparent; + } + + .pagination>li>a:focus, + .pagination>li>a:hover, + .pagination>li>span:focus, + .pagination>li>span:hover { + background: white; + } + + .pagination>li:last-child>a, .pagination>li:last-child>span, + .pagination>li:first-child>a, .pagination>li:first-child>span { + border-radius: 25px; + } + + .dataTables_filter { + text-align: right; + } + + .dataTables_filter label { + font-weight: normal; + white-space: nowrap; + text-align: left; + } + + .dataTables_filter input { + margin-left: 0.5em; + display: inline-block; + width: auto; + border-radius: 25px; + border: none; } \ No newline at end of file diff --git a/src/resources/views/inc/datatables_logic.blade.php b/src/resources/views/inc/datatables_logic.blade.php index b604e1bb40..847280d991 100644 --- a/src/resources/views/inc/datatables_logic.blade.php +++ b/src/resources/views/inc/datatables_logic.blade.php @@ -84,8 +84,8 @@ functionsToRunOnDataTablesDrawEvent: [], "paginate": { "first": "{{ trans('backpack::crud.paginate.first') }}", "last": "{{ trans('backpack::crud.paginate.last') }}", - "next": "", - "previous": "" + "next": ">", + "previous": "<" }, "aria": { "sortAscending": "{{ trans('backpack::crud.aria.sortAscending') }}", @@ -107,9 +107,9 @@ functionsToRunOnDataTablesDrawEvent: [], "type": "POST" }, dom: - "<'row'<'col-sm-6 hidden-xs'l><'col-sm-6 hidden-print'f>>" + + "<'row hidden'<'col-sm-6 hidden-xs'i><'col-sm-6 hidden-print'f>>" + "<'row'<'col-sm-12'tr>>" + - "<'row'<'col-sm-5'i><'col-sm-2'B><'col-sm-5 hidden-print'p>>", + "<'row'<'col-sm-5'l><'col-sm-2'B><'col-sm-5 hidden-print'p>>", } } @@ -121,6 +121,12 @@ functionsToRunOnDataTablesDrawEvent: [], crud.table = $("#crudTable").DataTable(crud.dataTableConfiguration); + // move search bar + $("#crudTable_filter").appendTo($('#datatable_search_stack' )); + + // move "showing x out of y" info to header + $("#datatable_info_stack").html($('#crudTable_info')); + // override ajax error message $.fn.dataTable.ext.errMode = 'none'; $('#crudTable').on('error.dt', function(e, settings, techNote, message) { diff --git a/src/resources/views/inc/export_buttons.blade.php b/src/resources/views/inc/export_buttons.blade.php index 4c2f43cdc1..b56c89e0dc 100644 --- a/src/resources/views/inc/export_buttons.blade.php +++ b/src/resources/views/inc/export_buttons.blade.php @@ -9,6 +9,7 @@ diff --git a/src/resources/views/inc/filters_navbar.blade.php b/src/resources/views/inc/filters_navbar.blade.php index 3ecc122529..b7964e8a97 100644 --- a/src/resources/views/inc/filters_navbar.blade.php +++ b/src/resources/views/inc/filters_navbar.blade.php @@ -24,57 +24,6 @@
                            - -@push('crud_list_styles') - -@endpush - @push('crud_list_scripts') + + + @endpush + +@endif +{{-- End of Extra CSS and JS --}} +{{-- ########################################## --}} \ No newline at end of file From 6ee66ecd68f416f5e2d4cb0d5ff2bf87485c1cc3 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Fri, 9 Nov 2018 15:35:57 +0200 Subject: [PATCH 051/124] prettier select2_nested field --- src/resources/views/fields/select2_nested.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resources/views/fields/select2_nested.blade.php b/src/resources/views/fields/select2_nested.blade.php index b2ec088882..cbae59f879 100644 --- a/src/resources/views/fields/select2_nested.blade.php +++ b/src/resources/views/fields/select2_nested.blade.php @@ -17,7 +17,7 @@ function echoSelect2NestedEntry($entry, $field, $current_value) { $selected = ''; } echo ""; } } From c11e2c9a4a66aeb24c748abdd532adbe3bcf5b33 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Fri, 9 Nov 2018 15:40:51 +0200 Subject: [PATCH 052/124] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59524573ac..bc68e02ae7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ All Notable changes to `Backpack CRUD` will be documented in this file - #1516 - setters and getters for the current operation; - #1527 - custom titles, headings and subheadings; - #1518 - CrudPanel class is now macroable; +- #1687 - ```select2_nested``` field type; ---- From 850fa432c5f62821f7d3dc337c6b11936cb069dc Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Fri, 9 Nov 2018 16:44:45 +0200 Subject: [PATCH 053/124] fixes #502 --- .../views/fields/select2_grouped.blade.php | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 src/resources/views/fields/select2_grouped.blade.php diff --git a/src/resources/views/fields/select2_grouped.blade.php b/src/resources/views/fields/select2_grouped.blade.php new file mode 100644 index 0000000000..9be29024ae --- /dev/null +++ b/src/resources/views/fields/select2_grouped.blade.php @@ -0,0 +1,95 @@ + +@php + $current_value = old($field['name']) ? old($field['name']) : (isset($field['value']) ? $field['value'] : (isset($field['default']) ? $field['default'] : '' )); +@endphp + +
                            + + @include('crud::inc.field_translatable_icon') + @php + $entity_model = $crud->getRelationModel($field['entity'], - 1); + $group_by_model = (new $entity_model)->{$field['group_by']}()->getRelated(); + $categories = $group_by_model::has($field['group_by_relationship_back'])->get(); + + if (isset($field['model'])) { + $categorylessEntries = $field['model']::has($field['group_by'], '=', 0)->get(); + } + @endphp + + + {{-- HINT --}} + @if (isset($field['hint'])) +

                            {!! $field['hint'] !!}

                            + @endif +
                            + +{{-- ########################################## --}} +{{-- Extra CSS and JS for this particular field --}} +{{-- If a field type is shown multiple times on a form, the CSS and JS will only be loaded once --}} +@if ($crud->checkIfFieldIsFirstOfItsType($field, $fields)) + + {{-- FIELD CSS - will be loaded in the after_styles section --}} + @push('crud_fields_styles') + + + + @endpush + + {{-- FIELD JS - will be loaded in the after_scripts section --}} + @push('crud_fields_scripts') + + + + @endpush + +@endif +{{-- End of Extra CSS and JS --}} +{{-- ########################################## --}} \ No newline at end of file From 2fb64b5e07264d81b1ee7d8c00381f7e1136dc05 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Fri, 9 Nov 2018 16:54:12 +0200 Subject: [PATCH 054/124] added select2_grouped which does the same --- .../views/fields/select_grouped.blade.php | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 src/resources/views/fields/select_grouped.blade.php diff --git a/src/resources/views/fields/select_grouped.blade.php b/src/resources/views/fields/select_grouped.blade.php new file mode 100644 index 0000000000..6b3f1b718e --- /dev/null +++ b/src/resources/views/fields/select_grouped.blade.php @@ -0,0 +1,60 @@ + +@php + $current_value = old($field['name']) ? old($field['name']) : (isset($field['value']) ? $field['value'] : (isset($field['default']) ? $field['default'] : '' )); +@endphp + +
                            + + @include('crud::inc.field_translatable_icon') + @php + $entity_model = $crud->getRelationModel($field['entity'], - 1); + $group_by_model = (new $entity_model)->{$field['group_by']}()->getRelated(); + $categories = $group_by_model::has($field['group_by_relationship_back'])->get(); + + if (isset($field['model'])) { + $categorylessEntries = $field['model']::has($field['group_by'], '=', 0)->get(); + } + @endphp + + + {{-- HINT --}} + @if (isset($field['hint'])) +

                            {!! $field['hint'] !!}

                            + @endif +
                            \ No newline at end of file From 7e21af2f0d97c5384e81275f7e5a8e1273f9ffef Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Sat, 10 Nov 2018 09:11:52 +0200 Subject: [PATCH 055/124] Apply fixes from StyleCI (#1691) [ci skip] [skip ci] --- src/helpers.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/helpers.php b/src/helpers.php index dfa26a01e2..87dd9df4b0 100644 --- a/src/helpers.php +++ b/src/helpers.php @@ -1,9 +1,9 @@ Date: Sat, 10 Nov 2018 09:38:12 +0200 Subject: [PATCH 056/124] added str_brackets_to_dots to all fields --- src/resources/views/fields/address.blade.php | 4 ++-- src/resources/views/fields/base64_image.blade.php | 4 ++-- src/resources/views/fields/browse.blade.php | 2 +- src/resources/views/fields/browse_multiple.blade.php | 2 +- src/resources/views/fields/checkbox.blade.php | 2 +- src/resources/views/fields/ckeditor.blade.php | 2 +- src/resources/views/fields/color.blade.php | 2 +- src/resources/views/fields/color_picker.blade.php | 2 +- src/resources/views/fields/date.blade.php | 2 +- src/resources/views/fields/date_picker.blade.php | 2 +- src/resources/views/fields/date_range.blade.php | 4 ++-- src/resources/views/fields/datetime.blade.php | 2 +- src/resources/views/fields/datetime_picker.blade.php | 2 +- src/resources/views/fields/email.blade.php | 2 +- src/resources/views/fields/enum.blade.php | 2 +- src/resources/views/fields/hidden.blade.php | 2 +- src/resources/views/fields/icon_picker.blade.php | 4 ++-- src/resources/views/fields/image.blade.php | 2 +- src/resources/views/fields/month.blade.php | 2 +- src/resources/views/fields/number.blade.php | 2 +- src/resources/views/fields/radio.blade.php | 2 +- src/resources/views/fields/range.blade.php | 2 +- src/resources/views/fields/select.blade.php | 2 +- src/resources/views/fields/select2.blade.php | 2 +- src/resources/views/fields/select2_from_ajax.blade.php | 2 +- .../views/fields/select2_from_ajax_multiple.blade.php | 2 +- .../views/fields/select2_from_array.blade.php | 10 +++++----- src/resources/views/fields/select2_multiple.blade.php | 2 +- src/resources/views/fields/select_from_array.blade.php | 10 +++++----- src/resources/views/fields/select_multiple.blade.php | 2 +- src/resources/views/fields/simplemde.blade.php | 2 +- src/resources/views/fields/summernote.blade.php | 2 +- src/resources/views/fields/table.blade.php | 2 +- src/resources/views/fields/textarea.blade.php | 2 +- src/resources/views/fields/time.blade.php | 2 +- src/resources/views/fields/tinymce.blade.php | 2 +- src/resources/views/fields/upload.blade.php | 2 +- src/resources/views/fields/upload_multiple.blade.php | 2 +- src/resources/views/fields/url.blade.php | 2 +- src/resources/views/fields/video.blade.php | 2 +- src/resources/views/fields/week.blade.php | 2 +- 41 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/resources/views/fields/address.blade.php b/src/resources/views/fields/address.blade.php index 68fb27cb42..b5d343cf35 100644 --- a/src/resources/views/fields/address.blade.php +++ b/src/resources/views/fields/address.blade.php @@ -12,7 +12,7 @@
                            @include('crud::inc.field_translatable_icon') - + @if(isset($field['prefix']) || isset($field['suffix']))
                            @endif @if(isset($field['prefix']))
                            {!! $field['prefix'] !!}
                            @endif @@ -27,7 +27,7 @@ type="text" data-address="{"field": "{{$field['name']}}", "full": {{isset($field['store_as_json']) && $field['store_as_json'] ? 'true' : 'false'}} }" name="{{ $field['name'] }}" - value="{{ old($field['name']) ? old($field['name']) : (isset($field['value']) ? $field['value'] : (isset($field['default']) ? $field['default'] : '' )) }}" + value="{{ old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }}" @include('crud::inc.field_attributes') > @endif diff --git a/src/resources/views/fields/base64_image.blade.php b/src/resources/views/fields/base64_image.blade.php index 8d4bf8b8b9..503602cd9b 100644 --- a/src/resources/views/fields/base64_image.blade.php +++ b/src/resources/views/fields/base64_image.blade.php @@ -6,8 +6,8 @@
                            - @if(!is_null(old($field['name']))) - + @if(!is_null(old(str_brackets_to_dots($field['name'])))) + @elseif(isset($field['src']) && isset($entry)) @elseif(isset($field['value'])) diff --git a/src/resources/views/fields/browse.blade.php b/src/resources/views/fields/browse.blade.php index 4db7c1e3c0..c00b3220b1 100644 --- a/src/resources/views/fields/browse.blade.php +++ b/src/resources/views/fields/browse.blade.php @@ -9,7 +9,7 @@ id="{{ $field['name'] }}-filemanager" name="{{ $field['name'] }}" - value="{{ old($field['name']) ?? $field['value'] ?? $field['default'] ?? '' }}" + value="{{ old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }}" @include('crud::inc.field_attributes') @if(!isset($field['readonly']) || $field['readonly']) readonly @endif diff --git a/src/resources/views/fields/browse_multiple.blade.php b/src/resources/views/fields/browse_multiple.blade.php index bf1ea93d5a..732bb9c35a 100644 --- a/src/resources/views/fields/browse_multiple.blade.php +++ b/src/resources/views/fields/browse_multiple.blade.php @@ -1,6 +1,6 @@ @php $multiple = array_get($field, 'multiple', true); -$value = old($field['name']) ?? $field['value'] ?? $field['default'] ?? ''; +$value = old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? ''; if (!$multiple && is_array($value)) { $value = array_first($value); diff --git a/src/resources/views/fields/checkbox.blade.php b/src/resources/views/fields/checkbox.blade.php index 05c5790d46..a50a4bc884 100644 --- a/src/resources/views/fields/checkbox.blade.php +++ b/src/resources/views/fields/checkbox.blade.php @@ -9,7 +9,7 @@ name="{{ $field['name'] }}" - @if (old($field['name']) ?? $field['value'] ?? $field['default'] ?? false) + @if (old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? false) checked="checked" @endif diff --git a/src/resources/views/fields/ckeditor.blade.php b/src/resources/views/fields/ckeditor.blade.php index 73c166b108..9873d39a4f 100644 --- a/src/resources/views/fields/ckeditor.blade.php +++ b/src/resources/views/fields/ckeditor.blade.php @@ -6,7 +6,7 @@ id="ckeditor-{{ $field['name'] }}" name="{{ $field['name'] }}" @include('crud::inc.field_attributes', ['default_class' => 'form-control']) - >{{ old($field['name']) ?? $field['value'] ?? $field['default'] ?? '' }} + >{{ old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }} {{-- HINT --}} @if (isset($field['hint'])) diff --git a/src/resources/views/fields/color.blade.php b/src/resources/views/fields/color.blade.php index 3d20326056..2890442370 100644 --- a/src/resources/views/fields/color.blade.php +++ b/src/resources/views/fields/color.blade.php @@ -5,7 +5,7 @@ diff --git a/src/resources/views/fields/color_picker.blade.php b/src/resources/views/fields/color_picker.blade.php index a46de0a687..feffe45278 100644 --- a/src/resources/views/fields/color_picker.blade.php +++ b/src/resources/views/fields/color_picker.blade.php @@ -7,7 +7,7 @@
                            diff --git a/src/resources/views/fields/date.blade.php b/src/resources/views/fields/date.blade.php index dd96640394..050f2cb79c 100644 --- a/src/resources/views/fields/date.blade.php +++ b/src/resources/views/fields/date.blade.php @@ -14,7 +14,7 @@ diff --git a/src/resources/views/fields/date_picker.blade.php b/src/resources/views/fields/date_picker.blade.php index 56e6d4a004..63e2c1709d 100644 --- a/src/resources/views/fields/date_picker.blade.php +++ b/src/resources/views/fields/date_picker.blade.php @@ -11,7 +11,7 @@ ?>
                            - + @include('crud::inc.field_translatable_icon')
                            diff --git a/src/resources/views/fields/date_range.blade.php b/src/resources/views/fields/date_range.blade.php index ae4e5a4704..beb25ac9a8 100644 --- a/src/resources/views/fields/date_range.blade.php +++ b/src/resources/views/fields/date_range.blade.php @@ -26,8 +26,8 @@ function formatDate($entry, $dateFieldName) ?>
                            - - + +
                            diff --git a/src/resources/views/fields/datetime_picker.blade.php b/src/resources/views/fields/datetime_picker.blade.php index 79cd579920..0d15aa75ec 100644 --- a/src/resources/views/fields/datetime_picker.blade.php +++ b/src/resources/views/fields/datetime_picker.blade.php @@ -11,7 +11,7 @@ ?>
                            - + @include('crud::inc.field_translatable_icon')
                            diff --git a/src/resources/views/fields/email.blade.php b/src/resources/views/fields/email.blade.php index 4f3c510d90..3205643d01 100644 --- a/src/resources/views/fields/email.blade.php +++ b/src/resources/views/fields/email.blade.php @@ -5,7 +5,7 @@ diff --git a/src/resources/views/fields/enum.blade.php b/src/resources/views/fields/enum.blade.php index c7ea8679f3..4251524973 100644 --- a/src/resources/views/fields/enum.blade.php +++ b/src/resources/views/fields/enum.blade.php @@ -15,7 +15,7 @@ @if (count($entity_model::getPossibleEnumValues($field['name']))) @foreach ($entity_model::getPossibleEnumValues($field['name']) as $possible_value) diff --git a/src/resources/views/fields/hidden.blade.php b/src/resources/views/fields/hidden.blade.php index e0fd4fc404..21ac22ce18 100644 --- a/src/resources/views/fields/hidden.blade.php +++ b/src/resources/views/fields/hidden.blade.php @@ -11,7 +11,7 @@
                            \ No newline at end of file diff --git a/src/resources/views/fields/icon_picker.blade.php b/src/resources/views/fields/icon_picker.blade.php index 04bbbb5958..3c0dd6d774 100644 --- a/src/resources/views/fields/icon_picker.blade.php +++ b/src/resources/views/fields/icon_picker.blade.php @@ -12,11 +12,11 @@ @include('crud::inc.field_translatable_icon')
                            - +
                            diff --git a/src/resources/views/fields/image.blade.php b/src/resources/views/fields/image.blade.php index 4f290fa273..a73fdc01b1 100644 --- a/src/resources/views/fields/image.blade.php +++ b/src/resources/views/fields/image.blade.php @@ -5,7 +5,7 @@ } $prefix = isset($field['prefix']) ? $field['prefix'] : ''; - $value = old($field['name']) ?? $field['value'] ?? $field['default'] ?? ''; + $value = old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? ''; $image_url = $value ? preg_match('/^data\:image\//', $value) ? $value diff --git a/src/resources/views/fields/month.blade.php b/src/resources/views/fields/month.blade.php index 2b09b128da..43abd3595a 100644 --- a/src/resources/views/fields/month.blade.php +++ b/src/resources/views/fields/month.blade.php @@ -5,7 +5,7 @@ diff --git a/src/resources/views/fields/number.blade.php b/src/resources/views/fields/number.blade.php index 2af0a054ad..1590a765ec 100644 --- a/src/resources/views/fields/number.blade.php +++ b/src/resources/views/fields/number.blade.php @@ -9,7 +9,7 @@ type="number" name="{{ $field['name'] }}" id="{{ $field['name'] }}" - value="{{ old($field['name']) ?? $field['value'] ?? $field['default'] ?? '' }}" + value="{{ old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }}" @include('crud::inc.field_attributes') > @if(isset($field['suffix']))
                            {!! $field['suffix'] !!}
                            @endif diff --git a/src/resources/views/fields/radio.blade.php b/src/resources/views/fields/radio.blade.php index 0b7fc378fc..f7bd57900a 100644 --- a/src/resources/views/fields/radio.blade.php +++ b/src/resources/views/fields/radio.blade.php @@ -1,7 +1,7 @@ @php $optionPointer = 0; - $optionValue = old($field['name']) ?? $field['value'] ?? $field['default'] ?? ''; + $optionValue = old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? ''; // if the class isn't overwritten, use 'radio' if (!isset($field['attributes']['class'])) { diff --git a/src/resources/views/fields/range.blade.php b/src/resources/views/fields/range.blade.php index 97f78eda62..6b0ea692e5 100644 --- a/src/resources/views/fields/range.blade.php +++ b/src/resources/views/fields/range.blade.php @@ -5,7 +5,7 @@ diff --git a/src/resources/views/fields/select.blade.php b/src/resources/views/fields/select.blade.php index e4d1745078..b08a7a27ac 100644 --- a/src/resources/views/fields/select.blade.php +++ b/src/resources/views/fields/select.blade.php @@ -1,6 +1,6 @@ @php - $current_value = old($field['name']) ?? $field['value'] ?? $field['default'] ?? ''; + $current_value = old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? ''; @endphp
                            diff --git a/src/resources/views/fields/select2.blade.php b/src/resources/views/fields/select2.blade.php index b57f2af880..8d7c22ff3c 100644 --- a/src/resources/views/fields/select2.blade.php +++ b/src/resources/views/fields/select2.blade.php @@ -1,6 +1,6 @@ @php - $current_value = old($field['name']) ?? $field['value'] ?? $field['default'] ?? ''; + $current_value = old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? ''; @endphp
                            diff --git a/src/resources/views/fields/select2_from_ajax.blade.php b/src/resources/views/fields/select2_from_ajax.blade.php index 30cafc3cca..a1a78745de 100644 --- a/src/resources/views/fields/select2_from_ajax.blade.php +++ b/src/resources/views/fields/select2_from_ajax.blade.php @@ -2,7 +2,7 @@ @php $connected_entity = new $field['model']; $connected_entity_key_name = $connected_entity->getKeyName(); - $old_value = old($field['name']) ?? $field['value'] ?? $field['default'] ?? false; + $old_value = old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? false; @endphp
                            diff --git a/src/resources/views/fields/select2_from_ajax_multiple.blade.php b/src/resources/views/fields/select2_from_ajax_multiple.blade.php index ba6bf82868..20f6322883 100644 --- a/src/resources/views/fields/select2_from_ajax_multiple.blade.php +++ b/src/resources/views/fields/select2_from_ajax_multiple.blade.php @@ -2,7 +2,7 @@ @php $connected_entity = new $field['model']; $connected_entity_key_name = $connected_entity->getKeyName(); - $old_value = old($field['name']) ?? $field['value'] ?? $field['default'] ?? false; + $old_value = old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? false; @endphp
                            diff --git a/src/resources/views/fields/select2_from_array.blade.php b/src/resources/views/fields/select2_from_array.blade.php index b4ad2cce98..a87b835e3b 100644 --- a/src/resources/views/fields/select2_from_array.blade.php +++ b/src/resources/views/fields/select2_from_array.blade.php @@ -14,11 +14,11 @@ @if (count($field['options'])) @foreach ($field['options'] as $key => $value) - @if((old($field['name']) && ( - $key == old($field['name']) || - (is_array(old($field['name'])) && - in_array($key, old($field['name']))))) || - (null === old($field['name']) && + @if((old(str_brackets_to_dots($field['name'])) && ( + $key == old(str_brackets_to_dots($field['name'])) || + (is_array(old(str_brackets_to_dots($field['name']))) && + in_array($key, old(str_brackets_to_dots($field['name'])))))) || + (null === old(str_brackets_to_dots($field['name'])) && ((isset($field['value']) && ( $key == $field['value'] || ( is_array($field['value']) && diff --git a/src/resources/views/fields/select2_multiple.blade.php b/src/resources/views/fields/select2_multiple.blade.php index b9b581477c..28aa44d7b8 100644 --- a/src/resources/views/fields/select2_multiple.blade.php +++ b/src/resources/views/fields/select2_multiple.blade.php @@ -14,7 +14,7 @@ @if (isset($field['model'])) @foreach ($field['model']::all() as $connected_entity_entry) - @if( (old($field["name"]) && in_array($connected_entity_entry->getKey(), old($field["name"]))) || (is_null(old($field["name"])) && isset($field['value']) && in_array($connected_entity_entry->getKey(), $field['value']->pluck($connected_entity_entry->getKeyName(), $connected_entity_entry->getKeyName())->toArray()))) + @if( (old(str_brackets_to_dots($field["name"])) && in_array($connected_entity_entry->getKey(), old(str_brackets_to_dots($field["name"])))) || (is_null(old(str_brackets_to_dots($field["name"]))) && isset($field['value']) && in_array($connected_entity_entry->getKey(), $field['value']->pluck($connected_entity_entry->getKeyName(), $connected_entity_entry->getKeyName())->toArray()))) @else diff --git a/src/resources/views/fields/select_from_array.blade.php b/src/resources/views/fields/select_from_array.blade.php index 32416be8ca..73e4ccd897 100644 --- a/src/resources/views/fields/select_from_array.blade.php +++ b/src/resources/views/fields/select_from_array.blade.php @@ -14,11 +14,11 @@ @if (count($field['options'])) @foreach ($field['options'] as $key => $value) - @if((old($field['name']) && ( - $key == old($field['name']) || - (is_array(old($field['name'])) && - in_array($key, old($field['name']))))) || - (null === old($field['name']) && + @if((old(str_brackets_to_dots($field['name'])) && ( + $key == old(str_brackets_to_dots($field['name'])) || + (is_array(old(str_brackets_to_dots($field['name']))) && + in_array($key, old(str_brackets_to_dots($field['name'])))))) || + (null === old(str_brackets_to_dots($field['name'])) && ((isset($field['value']) && ( $key == $field['value'] || ( is_array($field['value']) && diff --git a/src/resources/views/fields/select_multiple.blade.php b/src/resources/views/fields/select_multiple.blade.php index 9d25438aef..acd6b43692 100644 --- a/src/resources/views/fields/select_multiple.blade.php +++ b/src/resources/views/fields/select_multiple.blade.php @@ -14,7 +14,7 @@ class="form-control" @if (isset($field['model'])) @foreach ($field['model']::all() as $connected_entity_entry) - @if( (old($field["name"]) && in_array($connected_entity_entry->getKey(), old($field["name"]))) || (is_null(old($field["name"])) && isset($field['value']) && in_array($connected_entity_entry->getKey(), $field['value']->pluck($connected_entity_entry->getKeyName(), $connected_entity_entry->getKeyName())->toArray()))) + @if( (old(str_brackets_to_dots($field["name"])) && in_array($connected_entity_entry->getKey(), old(str_brackets_to_dots($field["name"])))) || (is_null(old(str_brackets_to_dots($field["name"]))) && isset($field['value']) && in_array($connected_entity_entry->getKey(), $field['value']->pluck($connected_entity_entry->getKeyName(), $connected_entity_entry->getKeyName())->toArray()))) @else diff --git a/src/resources/views/fields/simplemde.blade.php b/src/resources/views/fields/simplemde.blade.php index 58fd47eab4..7b880bafc0 100644 --- a/src/resources/views/fields/simplemde.blade.php +++ b/src/resources/views/fields/simplemde.blade.php @@ -6,7 +6,7 @@ id="simplemde_{{ $field['name'] }}" name="{{ $field['name'] }}" @include('crud::inc.field_attributes', ['default_class' => 'form-control']) - >{{ old($field['name']) ?? $field['value'] ?? $field['default'] ?? '' }} + >{{ old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }} {{-- HINT --}} @if (isset($field['hint'])) diff --git a/src/resources/views/fields/summernote.blade.php b/src/resources/views/fields/summernote.blade.php index 4d98281e67..65069b4697 100644 --- a/src/resources/views/fields/summernote.blade.php +++ b/src/resources/views/fields/summernote.blade.php @@ -5,7 +5,7 @@ + >{{ old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }} {{-- HINT --}} @if (isset($field['hint'])) diff --git a/src/resources/views/fields/table.blade.php b/src/resources/views/fields/table.blade.php index ccb8522748..296d2e42ab 100644 --- a/src/resources/views/fields/table.blade.php +++ b/src/resources/views/fields/table.blade.php @@ -5,7 +5,7 @@ $min = isset($field['min']) && (int) $field['min'] > 0 ? $field['min'] : -1; $item_name = strtolower(isset($field['entity_singular']) && !empty($field['entity_singular']) ? $field['entity_singular'] : $field['label']); - $items = old($field['name']) ?? $field['value'] ?? $field['default'] ?? ''; + $items = old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? ''; // make sure not matter the attribute casting // the $items variable contains a properly defined JSON diff --git a/src/resources/views/fields/textarea.blade.php b/src/resources/views/fields/textarea.blade.php index 95944abcd8..af636ddd65 100644 --- a/src/resources/views/fields/textarea.blade.php +++ b/src/resources/views/fields/textarea.blade.php @@ -6,7 +6,7 @@ name="{{ $field['name'] }}" @include('crud::inc.field_attributes') - >{{ old($field['name']) ?? $field['value'] ?? $field['default'] ?? '' }} + >{{ old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }} {{-- HINT --}} @if (isset($field['hint'])) diff --git a/src/resources/views/fields/time.blade.php b/src/resources/views/fields/time.blade.php index 8612b7bf74..ac3cb39a54 100644 --- a/src/resources/views/fields/time.blade.php +++ b/src/resources/views/fields/time.blade.php @@ -5,7 +5,7 @@ diff --git a/src/resources/views/fields/tinymce.blade.php b/src/resources/views/fields/tinymce.blade.php index fb167fdcbd..f2bf5efa67 100644 --- a/src/resources/views/fields/tinymce.blade.php +++ b/src/resources/views/fields/tinymce.blade.php @@ -6,7 +6,7 @@ id="tinymce-{{ $field['name'] }}" name="{{ $field['name'] }}" @include('crud::inc.field_attributes', ['default_class' => 'form-control tinymce']) - >{{ old($field['name']) ?? $field['value'] ?? $field['default'] ?? '' }} + >{{ old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }} {{-- HINT --}} @if (isset($field['hint'])) diff --git a/src/resources/views/fields/upload.blade.php b/src/resources/views/fields/upload.blade.php index b798b33f29..105c7d7efa 100644 --- a/src/resources/views/fields/upload.blade.php +++ b/src/resources/views/fields/upload.blade.php @@ -23,7 +23,7 @@ type="file" id="{{ $field['name'] }}_file_input" name="{{ $field['name'] }}" - value="{{ old($field['name']) ?? $field['value'] ?? $field['default'] ?? '' }}" + value="{{ old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }}" @include('crud::inc.field_attributes', ['default_class' => isset($field['value']) && $field['value']!=null?'form-control hidden':'form-control']) > diff --git a/src/resources/views/fields/upload_multiple.blade.php b/src/resources/views/fields/upload_multiple.blade.php index d1563ed088..ed5d791639 100644 --- a/src/resources/views/fields/upload_multiple.blade.php +++ b/src/resources/views/fields/upload_multiple.blade.php @@ -21,7 +21,7 @@ type="file" id="{{ $field['name'] }}_file_input" name="{{ $field['name'] }}[]" - value="@if (old($field['name'])) old($field['name']) @elseif (isset($field['default'])) $field['default'] @endif" + value="@if (old(str_brackets_to_dots($field['name']))) old(str_brackets_to_dots($field['name'])) @elseif (isset($field['default'])) $field['default'] @endif" @include('crud::inc.field_attributes') multiple > diff --git a/src/resources/views/fields/url.blade.php b/src/resources/views/fields/url.blade.php index 4ba28a79f6..20b15b74fe 100644 --- a/src/resources/views/fields/url.blade.php +++ b/src/resources/views/fields/url.blade.php @@ -5,7 +5,7 @@ diff --git a/src/resources/views/fields/video.blade.php b/src/resources/views/fields/video.blade.php index 6d378c8d85..7b9ee893d7 100644 --- a/src/resources/views/fields/video.blade.php +++ b/src/resources/views/fields/video.blade.php @@ -1,7 +1,7 @@ From 570d73caf5ee09134f38de99e079abd57f5edc8c Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Sat, 10 Nov 2018 09:48:44 +0200 Subject: [PATCH 057/124] renamed str_brackets_to_dots to square_brackets_to_dots --- src/helpers.php | 4 ++-- src/resources/views/fields/address.blade.php | 4 ++-- src/resources/views/fields/base64_image.blade.php | 4 ++-- src/resources/views/fields/browse.blade.php | 2 +- src/resources/views/fields/browse_multiple.blade.php | 2 +- src/resources/views/fields/checkbox.blade.php | 2 +- src/resources/views/fields/ckeditor.blade.php | 2 +- src/resources/views/fields/color.blade.php | 2 +- src/resources/views/fields/color_picker.blade.php | 2 +- src/resources/views/fields/date.blade.php | 2 +- src/resources/views/fields/date_picker.blade.php | 2 +- src/resources/views/fields/date_range.blade.php | 4 ++-- src/resources/views/fields/datetime.blade.php | 2 +- src/resources/views/fields/datetime_picker.blade.php | 2 +- src/resources/views/fields/email.blade.php | 2 +- src/resources/views/fields/enum.blade.php | 2 +- src/resources/views/fields/hidden.blade.php | 2 +- src/resources/views/fields/icon_picker.blade.php | 4 ++-- src/resources/views/fields/image.blade.php | 2 +- src/resources/views/fields/month.blade.php | 2 +- src/resources/views/fields/number.blade.php | 2 +- src/resources/views/fields/radio.blade.php | 2 +- src/resources/views/fields/range.blade.php | 2 +- src/resources/views/fields/select.blade.php | 2 +- src/resources/views/fields/select2.blade.php | 2 +- src/resources/views/fields/select2_from_ajax.blade.php | 2 +- .../views/fields/select2_from_ajax_multiple.blade.php | 2 +- .../views/fields/select2_from_array.blade.php | 10 +++++----- src/resources/views/fields/select2_multiple.blade.php | 2 +- src/resources/views/fields/select_from_array.blade.php | 10 +++++----- src/resources/views/fields/select_multiple.blade.php | 2 +- src/resources/views/fields/simplemde.blade.php | 2 +- src/resources/views/fields/summernote.blade.php | 2 +- src/resources/views/fields/table.blade.php | 2 +- src/resources/views/fields/text.blade.php | 2 +- src/resources/views/fields/textarea.blade.php | 2 +- src/resources/views/fields/time.blade.php | 2 +- src/resources/views/fields/tinymce.blade.php | 2 +- src/resources/views/fields/upload.blade.php | 2 +- src/resources/views/fields/upload_multiple.blade.php | 2 +- src/resources/views/fields/url.blade.php | 2 +- src/resources/views/fields/video.blade.php | 2 +- src/resources/views/fields/week.blade.php | 2 +- 43 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/helpers.php b/src/helpers.php index 87dd9df4b0..3401e6baff 100644 --- a/src/helpers.php +++ b/src/helpers.php @@ -1,6 +1,6 @@ @include('crud::inc.field_translatable_icon') - + @if(isset($field['prefix']) || isset($field['suffix']))
                            @endif @if(isset($field['prefix']))
                            {!! $field['prefix'] !!}
                            @endif @@ -27,7 +27,7 @@ type="text" data-address="{"field": "{{$field['name']}}", "full": {{isset($field['store_as_json']) && $field['store_as_json'] ? 'true' : 'false'}} }" name="{{ $field['name'] }}" - value="{{ old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }}" + value="{{ old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }}" @include('crud::inc.field_attributes') > @endif diff --git a/src/resources/views/fields/base64_image.blade.php b/src/resources/views/fields/base64_image.blade.php index 503602cd9b..9389c5a761 100644 --- a/src/resources/views/fields/base64_image.blade.php +++ b/src/resources/views/fields/base64_image.blade.php @@ -6,8 +6,8 @@
                            - @if(!is_null(old(str_brackets_to_dots($field['name'])))) - + @if(!is_null(old(square_brackets_to_dots($field['name'])))) + @elseif(isset($field['src']) && isset($entry)) @elseif(isset($field['value'])) diff --git a/src/resources/views/fields/browse.blade.php b/src/resources/views/fields/browse.blade.php index c00b3220b1..464cfa1b71 100644 --- a/src/resources/views/fields/browse.blade.php +++ b/src/resources/views/fields/browse.blade.php @@ -9,7 +9,7 @@ id="{{ $field['name'] }}-filemanager" name="{{ $field['name'] }}" - value="{{ old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }}" + value="{{ old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }}" @include('crud::inc.field_attributes') @if(!isset($field['readonly']) || $field['readonly']) readonly @endif diff --git a/src/resources/views/fields/browse_multiple.blade.php b/src/resources/views/fields/browse_multiple.blade.php index 732bb9c35a..a03469a35c 100644 --- a/src/resources/views/fields/browse_multiple.blade.php +++ b/src/resources/views/fields/browse_multiple.blade.php @@ -1,6 +1,6 @@ @php $multiple = array_get($field, 'multiple', true); -$value = old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? ''; +$value = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? ''; if (!$multiple && is_array($value)) { $value = array_first($value); diff --git a/src/resources/views/fields/checkbox.blade.php b/src/resources/views/fields/checkbox.blade.php index a50a4bc884..6299b93e24 100644 --- a/src/resources/views/fields/checkbox.blade.php +++ b/src/resources/views/fields/checkbox.blade.php @@ -9,7 +9,7 @@ name="{{ $field['name'] }}" - @if (old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? false) + @if (old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? false) checked="checked" @endif diff --git a/src/resources/views/fields/ckeditor.blade.php b/src/resources/views/fields/ckeditor.blade.php index 9873d39a4f..7dfa84072a 100644 --- a/src/resources/views/fields/ckeditor.blade.php +++ b/src/resources/views/fields/ckeditor.blade.php @@ -6,7 +6,7 @@ id="ckeditor-{{ $field['name'] }}" name="{{ $field['name'] }}" @include('crud::inc.field_attributes', ['default_class' => 'form-control']) - >{{ old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }} + >{{ old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }} {{-- HINT --}} @if (isset($field['hint'])) diff --git a/src/resources/views/fields/color.blade.php b/src/resources/views/fields/color.blade.php index 2890442370..f06af52cbc 100644 --- a/src/resources/views/fields/color.blade.php +++ b/src/resources/views/fields/color.blade.php @@ -5,7 +5,7 @@ diff --git a/src/resources/views/fields/color_picker.blade.php b/src/resources/views/fields/color_picker.blade.php index feffe45278..a54c30137d 100644 --- a/src/resources/views/fields/color_picker.blade.php +++ b/src/resources/views/fields/color_picker.blade.php @@ -7,7 +7,7 @@
                            diff --git a/src/resources/views/fields/date.blade.php b/src/resources/views/fields/date.blade.php index 050f2cb79c..b6389456bc 100644 --- a/src/resources/views/fields/date.blade.php +++ b/src/resources/views/fields/date.blade.php @@ -14,7 +14,7 @@ diff --git a/src/resources/views/fields/date_picker.blade.php b/src/resources/views/fields/date_picker.blade.php index 63e2c1709d..410b42c06f 100644 --- a/src/resources/views/fields/date_picker.blade.php +++ b/src/resources/views/fields/date_picker.blade.php @@ -11,7 +11,7 @@ ?>
                            - + @include('crud::inc.field_translatable_icon')
                            diff --git a/src/resources/views/fields/date_range.blade.php b/src/resources/views/fields/date_range.blade.php index beb25ac9a8..cd4c71a002 100644 --- a/src/resources/views/fields/date_range.blade.php +++ b/src/resources/views/fields/date_range.blade.php @@ -26,8 +26,8 @@ function formatDate($entry, $dateFieldName) ?>
                            - - + +
                            diff --git a/src/resources/views/fields/datetime_picker.blade.php b/src/resources/views/fields/datetime_picker.blade.php index 0d15aa75ec..72513f3d4a 100644 --- a/src/resources/views/fields/datetime_picker.blade.php +++ b/src/resources/views/fields/datetime_picker.blade.php @@ -11,7 +11,7 @@ ?>
                            - + @include('crud::inc.field_translatable_icon')
                            diff --git a/src/resources/views/fields/email.blade.php b/src/resources/views/fields/email.blade.php index 3205643d01..7dd3a968ab 100644 --- a/src/resources/views/fields/email.blade.php +++ b/src/resources/views/fields/email.blade.php @@ -5,7 +5,7 @@ diff --git a/src/resources/views/fields/enum.blade.php b/src/resources/views/fields/enum.blade.php index 4251524973..a53794fe4b 100644 --- a/src/resources/views/fields/enum.blade.php +++ b/src/resources/views/fields/enum.blade.php @@ -15,7 +15,7 @@ @if (count($entity_model::getPossibleEnumValues($field['name']))) @foreach ($entity_model::getPossibleEnumValues($field['name']) as $possible_value) diff --git a/src/resources/views/fields/hidden.blade.php b/src/resources/views/fields/hidden.blade.php index 21ac22ce18..b1834db275 100644 --- a/src/resources/views/fields/hidden.blade.php +++ b/src/resources/views/fields/hidden.blade.php @@ -11,7 +11,7 @@
                            \ No newline at end of file diff --git a/src/resources/views/fields/icon_picker.blade.php b/src/resources/views/fields/icon_picker.blade.php index 3c0dd6d774..559fa6a416 100644 --- a/src/resources/views/fields/icon_picker.blade.php +++ b/src/resources/views/fields/icon_picker.blade.php @@ -12,11 +12,11 @@ @include('crud::inc.field_translatable_icon')
                            - +
                            diff --git a/src/resources/views/fields/image.blade.php b/src/resources/views/fields/image.blade.php index a73fdc01b1..9709421d8c 100644 --- a/src/resources/views/fields/image.blade.php +++ b/src/resources/views/fields/image.blade.php @@ -5,7 +5,7 @@ } $prefix = isset($field['prefix']) ? $field['prefix'] : ''; - $value = old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? ''; + $value = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? ''; $image_url = $value ? preg_match('/^data\:image\//', $value) ? $value diff --git a/src/resources/views/fields/month.blade.php b/src/resources/views/fields/month.blade.php index 43abd3595a..9f1d613f35 100644 --- a/src/resources/views/fields/month.blade.php +++ b/src/resources/views/fields/month.blade.php @@ -5,7 +5,7 @@ diff --git a/src/resources/views/fields/number.blade.php b/src/resources/views/fields/number.blade.php index 1590a765ec..c290ccc447 100644 --- a/src/resources/views/fields/number.blade.php +++ b/src/resources/views/fields/number.blade.php @@ -9,7 +9,7 @@ type="number" name="{{ $field['name'] }}" id="{{ $field['name'] }}" - value="{{ old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }}" + value="{{ old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }}" @include('crud::inc.field_attributes') > @if(isset($field['suffix']))
                            {!! $field['suffix'] !!}
                            @endif diff --git a/src/resources/views/fields/radio.blade.php b/src/resources/views/fields/radio.blade.php index f7bd57900a..a7ed9b691d 100644 --- a/src/resources/views/fields/radio.blade.php +++ b/src/resources/views/fields/radio.blade.php @@ -1,7 +1,7 @@ @php $optionPointer = 0; - $optionValue = old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? ''; + $optionValue = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? ''; // if the class isn't overwritten, use 'radio' if (!isset($field['attributes']['class'])) { diff --git a/src/resources/views/fields/range.blade.php b/src/resources/views/fields/range.blade.php index 6b0ea692e5..af10e5c718 100644 --- a/src/resources/views/fields/range.blade.php +++ b/src/resources/views/fields/range.blade.php @@ -5,7 +5,7 @@ diff --git a/src/resources/views/fields/select.blade.php b/src/resources/views/fields/select.blade.php index b08a7a27ac..3e0f23d8cb 100644 --- a/src/resources/views/fields/select.blade.php +++ b/src/resources/views/fields/select.blade.php @@ -1,6 +1,6 @@ @php - $current_value = old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? ''; + $current_value = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? ''; @endphp
                            diff --git a/src/resources/views/fields/select2.blade.php b/src/resources/views/fields/select2.blade.php index 8d7c22ff3c..fa95f6b03e 100644 --- a/src/resources/views/fields/select2.blade.php +++ b/src/resources/views/fields/select2.blade.php @@ -1,6 +1,6 @@ @php - $current_value = old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? ''; + $current_value = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? ''; @endphp
                            diff --git a/src/resources/views/fields/select2_from_ajax.blade.php b/src/resources/views/fields/select2_from_ajax.blade.php index a1a78745de..c04d35959a 100644 --- a/src/resources/views/fields/select2_from_ajax.blade.php +++ b/src/resources/views/fields/select2_from_ajax.blade.php @@ -2,7 +2,7 @@ @php $connected_entity = new $field['model']; $connected_entity_key_name = $connected_entity->getKeyName(); - $old_value = old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? false; + $old_value = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? false; @endphp
                            diff --git a/src/resources/views/fields/select2_from_ajax_multiple.blade.php b/src/resources/views/fields/select2_from_ajax_multiple.blade.php index 20f6322883..b25aa126e3 100644 --- a/src/resources/views/fields/select2_from_ajax_multiple.blade.php +++ b/src/resources/views/fields/select2_from_ajax_multiple.blade.php @@ -2,7 +2,7 @@ @php $connected_entity = new $field['model']; $connected_entity_key_name = $connected_entity->getKeyName(); - $old_value = old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? false; + $old_value = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? false; @endphp
                            diff --git a/src/resources/views/fields/select2_from_array.blade.php b/src/resources/views/fields/select2_from_array.blade.php index a87b835e3b..13935fe90d 100644 --- a/src/resources/views/fields/select2_from_array.blade.php +++ b/src/resources/views/fields/select2_from_array.blade.php @@ -14,11 +14,11 @@ @if (count($field['options'])) @foreach ($field['options'] as $key => $value) - @if((old(str_brackets_to_dots($field['name'])) && ( - $key == old(str_brackets_to_dots($field['name'])) || - (is_array(old(str_brackets_to_dots($field['name']))) && - in_array($key, old(str_brackets_to_dots($field['name'])))))) || - (null === old(str_brackets_to_dots($field['name'])) && + @if((old(square_brackets_to_dots($field['name'])) && ( + $key == old(square_brackets_to_dots($field['name'])) || + (is_array(old(square_brackets_to_dots($field['name']))) && + in_array($key, old(square_brackets_to_dots($field['name'])))))) || + (null === old(square_brackets_to_dots($field['name'])) && ((isset($field['value']) && ( $key == $field['value'] || ( is_array($field['value']) && diff --git a/src/resources/views/fields/select2_multiple.blade.php b/src/resources/views/fields/select2_multiple.blade.php index 28aa44d7b8..0695ec5a00 100644 --- a/src/resources/views/fields/select2_multiple.blade.php +++ b/src/resources/views/fields/select2_multiple.blade.php @@ -14,7 +14,7 @@ @if (isset($field['model'])) @foreach ($field['model']::all() as $connected_entity_entry) - @if( (old(str_brackets_to_dots($field["name"])) && in_array($connected_entity_entry->getKey(), old(str_brackets_to_dots($field["name"])))) || (is_null(old(str_brackets_to_dots($field["name"]))) && isset($field['value']) && in_array($connected_entity_entry->getKey(), $field['value']->pluck($connected_entity_entry->getKeyName(), $connected_entity_entry->getKeyName())->toArray()))) + @if( (old(square_brackets_to_dots($field["name"])) && in_array($connected_entity_entry->getKey(), old(square_brackets_to_dots($field["name"])))) || (is_null(old(square_brackets_to_dots($field["name"]))) && isset($field['value']) && in_array($connected_entity_entry->getKey(), $field['value']->pluck($connected_entity_entry->getKeyName(), $connected_entity_entry->getKeyName())->toArray()))) @else diff --git a/src/resources/views/fields/select_from_array.blade.php b/src/resources/views/fields/select_from_array.blade.php index 73e4ccd897..25deceedca 100644 --- a/src/resources/views/fields/select_from_array.blade.php +++ b/src/resources/views/fields/select_from_array.blade.php @@ -14,11 +14,11 @@ @if (count($field['options'])) @foreach ($field['options'] as $key => $value) - @if((old(str_brackets_to_dots($field['name'])) && ( - $key == old(str_brackets_to_dots($field['name'])) || - (is_array(old(str_brackets_to_dots($field['name']))) && - in_array($key, old(str_brackets_to_dots($field['name'])))))) || - (null === old(str_brackets_to_dots($field['name'])) && + @if((old(square_brackets_to_dots($field['name'])) && ( + $key == old(square_brackets_to_dots($field['name'])) || + (is_array(old(square_brackets_to_dots($field['name']))) && + in_array($key, old(square_brackets_to_dots($field['name'])))))) || + (null === old(square_brackets_to_dots($field['name'])) && ((isset($field['value']) && ( $key == $field['value'] || ( is_array($field['value']) && diff --git a/src/resources/views/fields/select_multiple.blade.php b/src/resources/views/fields/select_multiple.blade.php index acd6b43692..7315eb623e 100644 --- a/src/resources/views/fields/select_multiple.blade.php +++ b/src/resources/views/fields/select_multiple.blade.php @@ -14,7 +14,7 @@ class="form-control" @if (isset($field['model'])) @foreach ($field['model']::all() as $connected_entity_entry) - @if( (old(str_brackets_to_dots($field["name"])) && in_array($connected_entity_entry->getKey(), old(str_brackets_to_dots($field["name"])))) || (is_null(old(str_brackets_to_dots($field["name"]))) && isset($field['value']) && in_array($connected_entity_entry->getKey(), $field['value']->pluck($connected_entity_entry->getKeyName(), $connected_entity_entry->getKeyName())->toArray()))) + @if( (old(square_brackets_to_dots($field["name"])) && in_array($connected_entity_entry->getKey(), old(square_brackets_to_dots($field["name"])))) || (is_null(old(square_brackets_to_dots($field["name"]))) && isset($field['value']) && in_array($connected_entity_entry->getKey(), $field['value']->pluck($connected_entity_entry->getKeyName(), $connected_entity_entry->getKeyName())->toArray()))) @else diff --git a/src/resources/views/fields/simplemde.blade.php b/src/resources/views/fields/simplemde.blade.php index 7b880bafc0..4e4fb3f648 100644 --- a/src/resources/views/fields/simplemde.blade.php +++ b/src/resources/views/fields/simplemde.blade.php @@ -6,7 +6,7 @@ id="simplemde_{{ $field['name'] }}" name="{{ $field['name'] }}" @include('crud::inc.field_attributes', ['default_class' => 'form-control']) - >{{ old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }} + >{{ old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }} {{-- HINT --}} @if (isset($field['hint'])) diff --git a/src/resources/views/fields/summernote.blade.php b/src/resources/views/fields/summernote.blade.php index 65069b4697..8461dfe031 100644 --- a/src/resources/views/fields/summernote.blade.php +++ b/src/resources/views/fields/summernote.blade.php @@ -5,7 +5,7 @@ + >{{ old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }} {{-- HINT --}} @if (isset($field['hint'])) diff --git a/src/resources/views/fields/table.blade.php b/src/resources/views/fields/table.blade.php index 296d2e42ab..a395cacd3f 100644 --- a/src/resources/views/fields/table.blade.php +++ b/src/resources/views/fields/table.blade.php @@ -5,7 +5,7 @@ $min = isset($field['min']) && (int) $field['min'] > 0 ? $field['min'] : -1; $item_name = strtolower(isset($field['entity_singular']) && !empty($field['entity_singular']) ? $field['entity_singular'] : $field['label']); - $items = old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? ''; + $items = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? ''; // make sure not matter the attribute casting // the $items variable contains a properly defined JSON diff --git a/src/resources/views/fields/text.blade.php b/src/resources/views/fields/text.blade.php index 0d7452abab..7017299994 100644 --- a/src/resources/views/fields/text.blade.php +++ b/src/resources/views/fields/text.blade.php @@ -8,7 +8,7 @@ @if(isset($field['suffix']))
                            {!! $field['suffix'] !!}
                            @endif diff --git a/src/resources/views/fields/textarea.blade.php b/src/resources/views/fields/textarea.blade.php index af636ddd65..57db863566 100644 --- a/src/resources/views/fields/textarea.blade.php +++ b/src/resources/views/fields/textarea.blade.php @@ -6,7 +6,7 @@ name="{{ $field['name'] }}" @include('crud::inc.field_attributes') - >{{ old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }} + >{{ old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }} {{-- HINT --}} @if (isset($field['hint'])) diff --git a/src/resources/views/fields/time.blade.php b/src/resources/views/fields/time.blade.php index ac3cb39a54..e4c613bc97 100644 --- a/src/resources/views/fields/time.blade.php +++ b/src/resources/views/fields/time.blade.php @@ -5,7 +5,7 @@ diff --git a/src/resources/views/fields/tinymce.blade.php b/src/resources/views/fields/tinymce.blade.php index f2bf5efa67..a7c07365d2 100644 --- a/src/resources/views/fields/tinymce.blade.php +++ b/src/resources/views/fields/tinymce.blade.php @@ -6,7 +6,7 @@ id="tinymce-{{ $field['name'] }}" name="{{ $field['name'] }}" @include('crud::inc.field_attributes', ['default_class' => 'form-control tinymce']) - >{{ old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }} + >{{ old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }} {{-- HINT --}} @if (isset($field['hint'])) diff --git a/src/resources/views/fields/upload.blade.php b/src/resources/views/fields/upload.blade.php index 105c7d7efa..009e4c801d 100644 --- a/src/resources/views/fields/upload.blade.php +++ b/src/resources/views/fields/upload.blade.php @@ -23,7 +23,7 @@ type="file" id="{{ $field['name'] }}_file_input" name="{{ $field['name'] }}" - value="{{ old(str_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }}" + value="{{ old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? '' }}" @include('crud::inc.field_attributes', ['default_class' => isset($field['value']) && $field['value']!=null?'form-control hidden':'form-control']) > diff --git a/src/resources/views/fields/upload_multiple.blade.php b/src/resources/views/fields/upload_multiple.blade.php index ed5d791639..336bdd2708 100644 --- a/src/resources/views/fields/upload_multiple.blade.php +++ b/src/resources/views/fields/upload_multiple.blade.php @@ -21,7 +21,7 @@ type="file" id="{{ $field['name'] }}_file_input" name="{{ $field['name'] }}[]" - value="@if (old(str_brackets_to_dots($field['name']))) old(str_brackets_to_dots($field['name'])) @elseif (isset($field['default'])) $field['default'] @endif" + value="@if (old(square_brackets_to_dots($field['name']))) old(square_brackets_to_dots($field['name'])) @elseif (isset($field['default'])) $field['default'] @endif" @include('crud::inc.field_attributes') multiple > diff --git a/src/resources/views/fields/url.blade.php b/src/resources/views/fields/url.blade.php index 20b15b74fe..62c6ea50a4 100644 --- a/src/resources/views/fields/url.blade.php +++ b/src/resources/views/fields/url.blade.php @@ -5,7 +5,7 @@ diff --git a/src/resources/views/fields/video.blade.php b/src/resources/views/fields/video.blade.php index 7b9ee893d7..f7cb1652c4 100644 --- a/src/resources/views/fields/video.blade.php +++ b/src/resources/views/fields/video.blade.php @@ -1,7 +1,7 @@ From e2c8928fc8be2c02a0da6bc973112e1748bd427c Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Sun, 11 Nov 2018 10:58:24 +0200 Subject: [PATCH 058/124] changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1aa26a612d..0e24d6d7b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,10 @@ All Notable changes to `Backpack CRUD` will be documented in this file - #1518 - CrudPanel class is now macroable; - #1687 - ```select2_nested``` field type; +### Fixed +- #1390 - using our own helper ```mb_ucfirst()``` instead of ```ucfirst()```; + + ---- From 2ec784ef6875905575e79e1cc4735b7ee7cd2a61 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Sun, 11 Nov 2018 11:40:33 +0200 Subject: [PATCH 059/124] Added callback options for select field type --- src/resources/views/fields/select.blade.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/resources/views/fields/select.blade.php b/src/resources/views/fields/select.blade.php index e4d1745078..fdaec3254d 100644 --- a/src/resources/views/fields/select.blade.php +++ b/src/resources/views/fields/select.blade.php @@ -1,6 +1,12 @@ @php $current_value = old($field['name']) ?? $field['value'] ?? $field['default'] ?? ''; + + if (!isset($field['options'])) { + $options = $field['model']::all(); + } else { + $options = call_user_func($field['options'], $field['model']::query()); + } @endphp
                            @@ -18,8 +24,8 @@ @endif - @if (isset($field['model'])) - @foreach ($field['model']::all() as $connected_entity_entry) + @if (count($options)) + @foreach ($options as $connected_entity_entry) @if($current_value == $connected_entity_entry->getKey()) @else From 58dd793b2daffeada7ae46c18c136f2386375533 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Sun, 11 Nov 2018 12:32:14 +0200 Subject: [PATCH 060/124] autoload the base helpers --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 0fb4dd83bf..fa75417a78 100644 --- a/composer.json +++ b/composer.json @@ -46,6 +46,7 @@ "psr-4": { "Backpack\\CRUD\\Tests\\": "tests" }, + "files": ["vendor/backpack/base/src/helpers.php"], "exclude-from-classmap": [ "**/config" ] From 97831352ccf5baed8ae5e218c29ed5f34d99ae42 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Sun, 11 Nov 2018 16:39:04 +0200 Subject: [PATCH 061/124] added options option for select2, select2_multiple and select_multiple fields --- src/resources/views/fields/select.blade.php | 2 +- src/resources/views/fields/select2.blade.php | 18 ++++++++++++------ .../views/fields/select2_multiple.blade.php | 10 +++++++++- .../views/fields/select_multiple.blade.php | 14 ++++++++++++-- 4 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/resources/views/fields/select.blade.php b/src/resources/views/fields/select.blade.php index fdaec3254d..6fe5c47541 100644 --- a/src/resources/views/fields/select.blade.php +++ b/src/resources/views/fields/select.blade.php @@ -1,6 +1,7 @@ @php $current_value = old($field['name']) ?? $field['value'] ?? $field['default'] ?? ''; + $entity_model = $crud->getRelationModel($field['entity'], - 1); if (!isset($field['options'])) { $options = $field['model']::all(); @@ -14,7 +15,6 @@ @include('crud::inc.field_translatable_icon') - getRelationModel($field['entity'], - 1); ?> - @endif - @if (isset($field['model'])) - @foreach ($field['model']::all() as $connected_entity_entry) - @if($current_value == $connected_entity_entry->getKey()) - + @if (count($options)) + @foreach ($options as $option) + @if($current_value == $option->getKey()) + @else - + @endif @endforeach @endif diff --git a/src/resources/views/fields/select2_multiple.blade.php b/src/resources/views/fields/select2_multiple.blade.php index b9b581477c..0bb60ae49e 100644 --- a/src/resources/views/fields/select2_multiple.blade.php +++ b/src/resources/views/fields/select2_multiple.blade.php @@ -1,4 +1,12 @@ +@php + if (!isset($field['options'])) { + $options = $field['model']::all(); + } else { + $options = call_user_func($field['options'], $field['model']::query()); + } +@endphp +
                            @include('crud::inc.field_translatable_icon') @@ -13,7 +21,7 @@ @endif @if (isset($field['model'])) - @foreach ($field['model']::all() as $connected_entity_entry) + @foreach ($options as $connected_entity_entry) @if( (old($field["name"]) && in_array($connected_entity_entry->getKey(), old($field["name"]))) || (is_null(old($field["name"])) && isset($field['value']) && in_array($connected_entity_entry->getKey(), $field['value']->pluck($connected_entity_entry->getKeyName(), $connected_entity_entry->getKeyName())->toArray()))) @else diff --git a/src/resources/views/fields/select_multiple.blade.php b/src/resources/views/fields/select_multiple.blade.php index 9d25438aef..46aef7ad68 100644 --- a/src/resources/views/fields/select_multiple.blade.php +++ b/src/resources/views/fields/select_multiple.blade.php @@ -1,7 +1,17 @@ +@php + if (!isset($field['options'])) { + $options = $field['model']::all(); + } else { + $options = call_user_func($field['options'], $field['model']::query()); + } +@endphp +
                            + @include('crud::inc.field_translatable_icon') + @else +
                            @include('crud::inc.show_fields', ['fields' => $fields]) +
                            @endif {{-- Define blade stacks so css and js can be pushed from the fields to these sections. --}} diff --git a/src/resources/views/inc/show_fields.blade.php b/src/resources/views/inc/show_fields.blade.php index 1b1cba9115..2e1d9af3a2 100644 --- a/src/resources/views/inc/show_fields.blade.php +++ b/src/resources/views/inc/show_fields.blade.php @@ -6,4 +6,4 @@ @endphp @include($fieldsViewNamespace.'.'.$field['type'], ['field' => $field]) -@endforeach +@endforeach \ No newline at end of file diff --git a/src/resources/views/inc/show_tabbed_fields.blade.php b/src/resources/views/inc/show_tabbed_fields.blade.php index 3da32d453c..552d42483f 100644 --- a/src/resources/views/inc/show_tabbed_fields.blade.php +++ b/src/resources/views/inc/show_tabbed_fields.blade.php @@ -35,7 +35,7 @@
                            -
                            +
                            @foreach ($crud->getTabs() as $k => $tab)
                            diff --git a/src/resources/views/list.blade.php b/src/resources/views/list.blade.php index d1ea5d0cb9..0b707ee889 100644 --- a/src/resources/views/list.blade.php +++ b/src/resources/views/list.blade.php @@ -44,7 +44,7 @@
                            - +
                            {{-- Table columns --}} diff --git a/src/resources/views/reorder.blade.php b/src/resources/views/reorder.blade.php index 1162fce1aa..fc51defac1 100644 --- a/src/resources/views/reorder.blade.php +++ b/src/resources/views/reorder.blade.php @@ -52,39 +52,41 @@ function tree_element($entry, $key, $all_entries, $crud) } ?> -
                            -
                            - @if ($crud->hasAccess('list')) - {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }}

                            - @endif - -
                            +@if ($crud->hasAccess('list')) + {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }} +@endif -
                            -

                            {{ trans('backpack::crud.reorder').' '.$crud->entity_name_plural }}

                            -
                            +
                            +
                            -
                            +
                            -

                            {{ trans('backpack::crud.reorder_text') }}

                            +
                            -
                              - all())->sortBy('lft')->keyBy($crud->getModel()->getKeyName()); - $root_entries = $all_entries->filter(function ($item) { - return $item->parent_id == 0; - }); - foreach ($root_entries as $key => $entry){ - $root_entries[$key] = tree_element($entry, $key, $all_entries, $crud); - } - ?> -
                            +
                            +
                            +

                            {{ trans('backpack::crud.reorder_text') }}

                            + +
                              + all())->sortBy('lft')->keyBy($crud->getModel()->getKeyName()); + $root_entries = $all_entries->filter(function ($item) { + return $item->parent_id == 0; + }); + foreach ($root_entries as $key => $entry){ + $root_entries[$key] = tree_element($entry, $key, $all_entries, $crud); + } + ?> +
                            +
                            +
                            -
                            -
                            +
                            + +
                            @endsection diff --git a/src/resources/views/revisions.blade.php b/src/resources/views/revisions.blade.php index d10d9ca494..133e4782f3 100644 --- a/src/resources/views/revisions.blade.php +++ b/src/resources/views/revisions.blade.php @@ -16,7 +16,7 @@ @section('content')
                            -
                            +
                            @if ($crud->hasAccess('list')) {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }}

                            diff --git a/src/resources/views/show.blade.php b/src/resources/views/show.blade.php index 3ba144bd8c..db3b8fe1ea 100644 --- a/src/resources/views/show.blade.php +++ b/src/resources/views/show.blade.php @@ -16,34 +16,33 @@ @section('content') @if ($crud->hasAccess('list')) - {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }}

                            + {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }} + + @endif
                            - -
                            -
                            - - - @if ($crud->model->translationEnabled()) - -
                            - -
                              - @foreach ($crud->model->getAvailableLocales() as $key => $locale) -
                            • {{ $locale }}
                              • - @endforeach -
                            -
                            -

                            {{ trans('backpack::crud.preview') .' '. $crud->entity_name }}

                            - @else -

                            {{ trans('backpack::crud.preview') .' '. $crud->entity_name }}

                            - @endif +
                            + @if ($crud->model->translationEnabled()) +
                            +
                            + +
                            + +
                              + @foreach ($crud->model->getAvailableLocales() as $key => $locale) +
                            • {{ $locale }}
                              • + @endforeach +
                            +
                            +
                            + @else + @endif
                            From ae78bc7bee64cedab30abaa9f7107ace8c37359c Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Mon, 12 Nov 2018 13:19:22 +0200 Subject: [PATCH 069/124] small design fix --- src/resources/views/form_content.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resources/views/form_content.blade.php b/src/resources/views/form_content.blade.php index c651fda89f..66fed9b3bd 100644 --- a/src/resources/views/form_content.blade.php +++ b/src/resources/views/form_content.blade.php @@ -7,7 +7,7 @@ @include('crud::inc.show_tabbed_fields') @else -
                            +
                            @include('crud::inc.show_fields', ['fields' => $fields])
                            @endif From 82e9d2c74072b1efe5c8525e227cb3b837dc52ca Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Mon, 12 Nov 2018 13:22:00 +0200 Subject: [PATCH 070/124] revisions back button is outside resizable container --- src/resources/views/revisions.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/resources/views/revisions.blade.php b/src/resources/views/revisions.blade.php index 133e4782f3..4f38b06ad2 100644 --- a/src/resources/views/revisions.blade.php +++ b/src/resources/views/revisions.blade.php @@ -15,12 +15,12 @@ @endsection @section('content') -
                            +@if ($crud->hasAccess('list')) + {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }} +@endif +
                            - @if ($crud->hasAccess('list')) - {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }}

                            - @endif @if(!count($revisions))
                            From d058642733c7f14bf119975a16506329f66f13bb Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Mon, 12 Nov 2018 13:24:43 +0200 Subject: [PATCH 071/124] Apply fixes from StyleCI (#1699) [ci skip] [skip ci] --- src/PanelTraits/Views.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/PanelTraits/Views.php b/src/PanelTraits/Views.php index f7a9349812..a12b37906e 100644 --- a/src/PanelTraits/Views.php +++ b/src/PanelTraits/Views.php @@ -305,7 +305,6 @@ public function getRevisionsTimelineView() return $this->revisionsTimelineView; } - /** * Sets the revisions timeline content class. * @param string revisions timeline content class From 065e44eb0a3422784038ece427922f71825ca2b5 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Mon, 12 Nov 2018 18:01:25 +0200 Subject: [PATCH 072/124] remove underscores from label names if the label has not been set - for crud fields --- src/PanelTraits/Fields.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PanelTraits/Fields.php b/src/PanelTraits/Fields.php index 2c6c798fdd..40ab357fe5 100644 --- a/src/PanelTraits/Fields.php +++ b/src/PanelTraits/Fields.php @@ -34,7 +34,7 @@ public function addField($field, $form = 'both') // if the label is missing, we should set it if (! isset($completeFieldsArray['label'])) { - $completeFieldsArray['label'] = mb_ucfirst($completeFieldsArray['name']); + $completeFieldsArray['label'] = mb_ucfirst(str_replace('_', ' ', $completeFieldsArray['name'])); } // if the field type is missing, we should set it From 41f0c2c0b6e78d3440267e17e65a17d91fddf5f3 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 13 Nov 2018 08:11:34 +0200 Subject: [PATCH 073/124] better edit and show for translatable entities --- src/resources/views/edit.blade.php | 28 ++++++++++++++-------------- src/resources/views/show.blade.php | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/resources/views/edit.blade.php b/src/resources/views/edit.blade.php index 8cbe5131ee..3d354f12e7 100644 --- a/src/resources/views/edit.blade.php +++ b/src/resources/views/edit.blade.php @@ -34,21 +34,21 @@ {!! csrf_field() !!} {!! method_field('PUT') !!}
                            -
                            - @if ($crud->model->translationEnabled()) - -
                            - -
                              - @foreach ($crud->model->getAvailableLocales() as $key => $locale) -
                            • {{ $locale }}
                              • - @endforeach -
                            -
                            - @endif + @if ($crud->model->translationEnabled()) +
                            + +
                            + +
                              + @foreach ($crud->model->getAvailableLocales() as $key => $locale) +
                            • {{ $locale }}
                              • + @endforeach +
                            +
                            + @endif
                            @if(view()->exists('vendor.backpack.crud.form_content')) diff --git a/src/resources/views/show.blade.php b/src/resources/views/show.blade.php index db3b8fe1ea..5c94d4c12b 100644 --- a/src/resources/views/show.blade.php +++ b/src/resources/views/show.blade.php @@ -30,8 +30,8 @@
                            -
                              @foreach ($crud->model->getAvailableLocales() as $key => $locale) From 1ca7b81e6f66a4c585eb9c9a636c993da79f4fef Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 13 Nov 2018 13:49:40 +0200 Subject: [PATCH 074/124] returned from panels to boxes, for backwards-compatibility; we can always change the css for a .box --- src/resources/views/form_content.blade.php | 2 +- src/resources/views/inc/show_tabbed_fields.blade.php | 2 +- src/resources/views/list.blade.php | 2 +- src/resources/views/show.blade.php | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/resources/views/form_content.blade.php b/src/resources/views/form_content.blade.php index 66fed9b3bd..153842fbcb 100644 --- a/src/resources/views/form_content.blade.php +++ b/src/resources/views/form_content.blade.php @@ -7,7 +7,7 @@ @include('crud::inc.show_tabbed_fields') @else -
                              +
                              @include('crud::inc.show_fields', ['fields' => $fields])
                              @endif diff --git a/src/resources/views/inc/show_tabbed_fields.blade.php b/src/resources/views/inc/show_tabbed_fields.blade.php index 552d42483f..07024eab13 100644 --- a/src/resources/views/inc/show_tabbed_fields.blade.php +++ b/src/resources/views/inc/show_tabbed_fields.blade.php @@ -35,7 +35,7 @@
                              -
                              +
                              @foreach ($crud->getTabs() as $k => $tab)
                              diff --git a/src/resources/views/list.blade.php b/src/resources/views/list.blade.php index 0b707ee889..d1ea5d0cb9 100644 --- a/src/resources/views/list.blade.php +++ b/src/resources/views/list.blade.php @@ -44,7 +44,7 @@
                              -
                            +
                            {{-- Table columns --}} diff --git a/src/resources/views/show.blade.php b/src/resources/views/show.blade.php index 5c94d4c12b..f27f80a6a6 100644 --- a/src/resources/views/show.blade.php +++ b/src/resources/views/show.blade.php @@ -43,8 +43,8 @@ @else @endif -
                            -
                            +
                            +
                            @foreach ($crud->columns as $column) From 6300893cdd96affe79cf94883a512c53abbffd04 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 13 Nov 2018 19:00:05 +0200 Subject: [PATCH 075/124] update URL when filtering; save datatable state --- src/app/Http/Controllers/Operations/SaveActions.php | 2 +- src/resources/views/filters/date.blade.php | 3 +++ src/resources/views/filters/date_range.blade.php | 7 +++++-- src/resources/views/filters/dropdown.blade.php | 3 +++ src/resources/views/filters/range.blade.php | 3 +++ src/resources/views/filters/select2.blade.php | 3 +++ src/resources/views/filters/select2_ajax.blade.php | 3 +++ src/resources/views/filters/select2_multiple.blade.php | 3 +++ src/resources/views/filters/simple.blade.php | 3 +++ src/resources/views/filters/text.blade.php | 3 +++ src/resources/views/form_content.blade.php | 2 ++ src/resources/views/inc/datatables_logic.blade.php | 1 + 12 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/app/Http/Controllers/Operations/SaveActions.php b/src/app/Http/Controllers/Operations/SaveActions.php index 8d4a537d5c..2fe5ec541f 100644 --- a/src/app/Http/Controllers/Operations/SaveActions.php +++ b/src/app/Http/Controllers/Operations/SaveActions.php @@ -101,7 +101,7 @@ public function performSaveAction($itemId = null) break; case 'save_and_back': default: - $redirectUrl = $this->crud->route; + $redirectUrl = \Request::has('http_referrer') ? \Request::get('http_referrer') : $this->crud->route; break; } diff --git a/src/resources/views/filters/date.blade.php b/src/resources/views/filters/date.blade.php index 1f74e00a6d..46c75183ee 100644 --- a/src/resources/views/filters/date.blade.php +++ b/src/resources/views/filters/date.blade.php @@ -78,6 +78,9 @@ class="dropdown {{ Request::get($filter->name)?'active':'' }}"> new_url = normalizeAmpersand(new_url.toString()); ajax_table.ajax.url(new_url).load(); + // add filter to URL + window.history.pushState({}, 'Nice title', new_url.replace('/search', '')); + // mark this filter as active in the navbar-filters if (URI(new_url).hasQuery('{{ $filter->name }}', true)) { $('li[filter-name={{ $filter->name }}]').removeClass('active').addClass('active'); diff --git a/src/resources/views/filters/date_range.blade.php b/src/resources/views/filters/date_range.blade.php index 66ba84a4ac..2fa30fa75b 100644 --- a/src/resources/views/filters/date_range.blade.php +++ b/src/resources/views/filters/date_range.blade.php @@ -84,6 +84,9 @@ function applyDateRangeFilter{{camel_case($filter->name)}}(start, end) { new_url = normalizeAmpersand(new_url.toString()); ajax_table.ajax.url(new_url).load(); + // add filter to URL + window.history.pushState({}, 'Nice title', new_url.replace('/search', '')); + // mark this filter as active in the navbar-filters if (URI(new_url).hasQuery('{{ $filter->name }}', true)) { $('li[filter-name={{ $filter->name }}]').removeClass('active').addClass('active'); @@ -114,8 +117,8 @@ function applyDateRangeFilter{{camel_case($filter->name)}}(start, end) { }); dateRangeInput.on('apply.daterangepicker', function(ev, picker) { - applyDateRangeFilter{{camel_case($filter->name)}}(picker.startDate, picker.endDate); - }); + applyDateRangeFilter{{camel_case($filter->name)}}(picker.startDate, picker.endDate); + }); $('li[filter-name={{ $filter->name }}]').on('hide.bs.dropdown', function () { if($('.daterangepicker').is(':visible')) diff --git a/src/resources/views/filters/dropdown.blade.php b/src/resources/views/filters/dropdown.blade.php index 49173419b4..dafb040142 100644 --- a/src/resources/views/filters/dropdown.blade.php +++ b/src/resources/views/filters/dropdown.blade.php @@ -57,6 +57,9 @@ class="dropdown {{ Request::get($filter->name)?'active':'' }}"> new_url = normalizeAmpersand(new_url.toString()); ajax_table.ajax.url(new_url).load(); + // add filter to URL + window.history.pushState({}, 'Nice title', new_url.replace('/search', '')); + // mark this filter as active in the navbar-filters // mark dropdown items active accordingly if (URI(new_url).hasQuery('{{ $filter->name }}', true)) { diff --git a/src/resources/views/filters/range.blade.php b/src/resources/views/filters/range.blade.php index 143665c6e4..bf8d507955 100644 --- a/src/resources/views/filters/range.blade.php +++ b/src/resources/views/filters/range.blade.php @@ -99,6 +99,9 @@ class="dropdown {{ Request::get($filter->name)?'active':'' }}"> new_url = normalizeAmpersand(new_url.toString()); ajax_table.ajax.url(new_url).load(); + // add filter to URL + window.history.pushState({}, 'Nice title', new_url.replace('/search', '')); + // mark this filter as active in the navbar-filters if (URI(new_url).hasQuery('{{ $filter->name }}', true)) { $('li[filter-name={{ $filter->name }}]').removeClass('active').addClass('active'); diff --git a/src/resources/views/filters/select2.blade.php b/src/resources/views/filters/select2.blade.php index 24a1a16018..21e1092780 100644 --- a/src/resources/views/filters/select2.blade.php +++ b/src/resources/views/filters/select2.blade.php @@ -89,6 +89,9 @@ class="dropdown {{ Request::get($filter->name)?'active':'' }}"> new_url = normalizeAmpersand(new_url.toString()); ajax_table.ajax.url(new_url).load(); + // add filter to URL + window.history.pushState({}, 'Nice title', new_url.replace('/search', '')); + // mark this filter as active in the navbar-filters if (URI(new_url).hasQuery('{{ $filter->name }}', true)) { $("li[filter-name={{ $filter->name }}]").removeClass('active').addClass('active'); diff --git a/src/resources/views/filters/select2_ajax.blade.php b/src/resources/views/filters/select2_ajax.blade.php index 4998da6fe7..96a1bb85a0 100644 --- a/src/resources/views/filters/select2_ajax.blade.php +++ b/src/resources/views/filters/select2_ajax.blade.php @@ -105,6 +105,9 @@ class="dropdown {{ Request::get($filter->name)?'active':'' }}"> // replace the datatables ajax url with new_url and reload it ajax_table.ajax.url(new_url).load(); + // add filter to URL + window.history.pushState({}, 'Nice title', new_url.replace('/search', '')); + // mark this filter as active in the navbar-filters if (URI(new_url).hasQuery('{{ $filter->name }}', true)) { $('li[filter-name={{ $filter->name }}]').removeClass('active').addClass('active'); diff --git a/src/resources/views/filters/select2_multiple.blade.php b/src/resources/views/filters/select2_multiple.blade.php index 20c005b5ac..15348066a2 100644 --- a/src/resources/views/filters/select2_multiple.blade.php +++ b/src/resources/views/filters/select2_multiple.blade.php @@ -96,6 +96,9 @@ class="dropdown {{ Request::get($filter->name)?'active':'' }}"> new_url = normalizeAmpersand(new_url.toString()); ajax_table.ajax.url(new_url).load(); + // add filter to URL + window.history.pushState({}, 'Nice title', new_url.replace('/search', '')); + // mark this filter as active in the navbar-filters if (URI(new_url).hasQuery('{{ $filter->name }}', true)) { $("li[filter-name={{ $filter->name }}]").removeClass('active').addClass('active'); diff --git a/src/resources/views/filters/simple.blade.php b/src/resources/views/filters/simple.blade.php index d346b24e1d..aa88a5cf7a 100644 --- a/src/resources/views/filters/simple.blade.php +++ b/src/resources/views/filters/simple.blade.php @@ -46,6 +46,9 @@ class="{{ Request::get($filter->name)?'active':'' }}"> // replace the datatables ajax url with new_url and reload it ajax_table.ajax.url(new_url).load(); + // add filter to URL + window.history.pushState({}, 'Nice title', new_url.replace('/search', '')); + // mark this filter as active in the navbar-filters if (URI(new_url).hasQuery('{{ $filter->name }}', true)) { $("li[filter-name={{ $filter->name }}]").removeClass('active').addClass('active'); diff --git a/src/resources/views/filters/text.blade.php b/src/resources/views/filters/text.blade.php index 871fc7ad5e..bf07163a47 100644 --- a/src/resources/views/filters/text.blade.php +++ b/src/resources/views/filters/text.blade.php @@ -47,6 +47,9 @@ class="dropdown {{ Request::get($filter->name) ? 'active' : '' }}"> new_url = normalizeAmpersand(new_url.toString()); ajax_table.ajax.url(new_url).load(); + // add filter to URL + window.history.pushState({}, 'Nice title', new_url.replace('/search', '')); + // mark this filter as active in the navbar-filters if (URI(new_url).hasQuery('{{ $filter->name }}', true)) { $('li[filter-name={{ $filter->name }}]').removeClass('active').addClass('active'); diff --git a/src/resources/views/form_content.blade.php b/src/resources/views/form_content.blade.php index 153842fbcb..c9d23b2f1c 100644 --- a/src/resources/views/form_content.blade.php +++ b/src/resources/views/form_content.blade.php @@ -1,3 +1,5 @@ +route) }}> + @if ($crud->model->translationEnabled()) request->input('locale')?$crud->request->input('locale'):App::getLocale() }}> @endif diff --git a/src/resources/views/inc/datatables_logic.blade.php b/src/resources/views/inc/datatables_logic.blade.php index a15d091e38..b1ec99321f 100644 --- a/src/resources/views/inc/datatables_logic.blade.php +++ b/src/resources/views/inc/datatables_logic.blade.php @@ -67,6 +67,7 @@ functionsToRunOnDataTablesDrawEvent: [], scrollX: true, @endif + stateSave: true, autoWidth: false, pageLength: {{ $crud->getDefaultPageLength() }}, lengthMenu: @json($crud->getPageLengthMenu()), From 105369bad571f0c36e26b3f483be38652c29c23f Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 13 Nov 2018 19:07:21 +0200 Subject: [PATCH 076/124] when creating and updating ignore http_referrer attribute --- src/app/Http/Controllers/Operations/Create.php | 2 +- src/app/Http/Controllers/Operations/Update.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/Http/Controllers/Operations/Create.php b/src/app/Http/Controllers/Operations/Create.php index 08f7470e57..c8187c960a 100644 --- a/src/app/Http/Controllers/Operations/Create.php +++ b/src/app/Http/Controllers/Operations/Create.php @@ -51,7 +51,7 @@ public function storeCrud(StoreRequest $request = null) } // insert item in the db - $item = $this->crud->create($request->except(['save_action', '_token', '_method', 'current_tab'])); + $item = $this->crud->create($request->except(['save_action', '_token', '_method', 'current_tab', 'http_referrer'])); $this->data['entry'] = $this->crud->entry = $item; // show a success message diff --git a/src/app/Http/Controllers/Operations/Update.php b/src/app/Http/Controllers/Operations/Update.php index 734c269af4..1be530d532 100644 --- a/src/app/Http/Controllers/Operations/Update.php +++ b/src/app/Http/Controllers/Operations/Update.php @@ -60,7 +60,7 @@ public function updateCrud(UpdateRequest $request = null) // update the row in the db $item = $this->crud->update($request->get($this->crud->model->getKeyName()), - $request->except('save_action', '_token', '_method', 'current_tab')); + $request->except('save_action', '_token', '_method', 'current_tab', 'http_referrer')); $this->data['entry'] = $this->crud->entry = $item; // show a success message From a264ffe3bafe4df2d3f853215cbb03cfbac12cb5 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 13 Nov 2018 19:17:13 +0200 Subject: [PATCH 077/124] show reorder revisions back buttons take you to filtered list view --- src/resources/views/reorder.blade.php | 2 +- src/resources/views/revisions.blade.php | 2 +- src/resources/views/show.blade.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/resources/views/reorder.blade.php b/src/resources/views/reorder.blade.php index fc51defac1..08b5d88e7a 100644 --- a/src/resources/views/reorder.blade.php +++ b/src/resources/views/reorder.blade.php @@ -54,7 +54,7 @@ function tree_element($entry, $key, $all_entries, $crud) ?> @if ($crud->hasAccess('list')) - {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }} + {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }} @endif
                            diff --git a/src/resources/views/revisions.blade.php b/src/resources/views/revisions.blade.php index 4f38b06ad2..8004011786 100644 --- a/src/resources/views/revisions.blade.php +++ b/src/resources/views/revisions.blade.php @@ -16,7 +16,7 @@ @section('content') @if ($crud->hasAccess('list')) - {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }} + {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }} @endif
                            diff --git a/src/resources/views/show.blade.php b/src/resources/views/show.blade.php index f27f80a6a6..ffa0217efc 100644 --- a/src/resources/views/show.blade.php +++ b/src/resources/views/show.blade.php @@ -16,7 +16,7 @@ @section('content') @if ($crud->hasAccess('list')) - {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }} + {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }} @endif From a77c81142a68b47b9179ca0e8d9626da9ee91ae4 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 13 Nov 2018 19:32:06 +0200 Subject: [PATCH 078/124] cleaned up filters remember url logic --- src/resources/views/create.blade.php | 2 +- src/resources/views/edit.blade.php | 2 +- src/resources/views/filters/date.blade.php | 2 +- src/resources/views/filters/date_range.blade.php | 2 +- src/resources/views/filters/dropdown.blade.php | 2 +- src/resources/views/filters/range.blade.php | 2 +- src/resources/views/filters/select2.blade.php | 2 +- src/resources/views/filters/select2_ajax.blade.php | 2 +- src/resources/views/filters/select2_multiple.blade.php | 2 +- src/resources/views/filters/simple.blade.php | 2 +- src/resources/views/filters/text.blade.php | 2 +- src/resources/views/inc/datatables_logic.blade.php | 3 +++ 12 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/resources/views/create.blade.php b/src/resources/views/create.blade.php index 1a1553853c..36e4c0b15d 100644 --- a/src/resources/views/create.blade.php +++ b/src/resources/views/create.blade.php @@ -16,7 +16,7 @@ @section('content') @if ($crud->hasAccess('list')) - {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }} + {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }} @endif
                            diff --git a/src/resources/views/edit.blade.php b/src/resources/views/edit.blade.php index 3d354f12e7..39ad0a3949 100644 --- a/src/resources/views/edit.blade.php +++ b/src/resources/views/edit.blade.php @@ -16,7 +16,7 @@ @section('content') @if ($crud->hasAccess('list')) - {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }} + {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }} @endif
                            diff --git a/src/resources/views/filters/date.blade.php b/src/resources/views/filters/date.blade.php index 46c75183ee..8b3e215629 100644 --- a/src/resources/views/filters/date.blade.php +++ b/src/resources/views/filters/date.blade.php @@ -79,7 +79,7 @@ class="dropdown {{ Request::get($filter->name)?'active':'' }}"> ajax_table.ajax.url(new_url).load(); // add filter to URL - window.history.pushState({}, 'Nice title', new_url.replace('/search', '')); + crud.updateUrl(new_url); // mark this filter as active in the navbar-filters if (URI(new_url).hasQuery('{{ $filter->name }}', true)) { diff --git a/src/resources/views/filters/date_range.blade.php b/src/resources/views/filters/date_range.blade.php index 2fa30fa75b..f4bb7fce29 100644 --- a/src/resources/views/filters/date_range.blade.php +++ b/src/resources/views/filters/date_range.blade.php @@ -85,7 +85,7 @@ function applyDateRangeFilter{{camel_case($filter->name)}}(start, end) { ajax_table.ajax.url(new_url).load(); // add filter to URL - window.history.pushState({}, 'Nice title', new_url.replace('/search', '')); + crud.updateUrl(new_url); // mark this filter as active in the navbar-filters if (URI(new_url).hasQuery('{{ $filter->name }}', true)) { diff --git a/src/resources/views/filters/dropdown.blade.php b/src/resources/views/filters/dropdown.blade.php index dafb040142..72565a8897 100644 --- a/src/resources/views/filters/dropdown.blade.php +++ b/src/resources/views/filters/dropdown.blade.php @@ -58,7 +58,7 @@ class="dropdown {{ Request::get($filter->name)?'active':'' }}"> ajax_table.ajax.url(new_url).load(); // add filter to URL - window.history.pushState({}, 'Nice title', new_url.replace('/search', '')); + crud.updateUrl(new_url); // mark this filter as active in the navbar-filters // mark dropdown items active accordingly diff --git a/src/resources/views/filters/range.blade.php b/src/resources/views/filters/range.blade.php index bf8d507955..4a01e8991a 100644 --- a/src/resources/views/filters/range.blade.php +++ b/src/resources/views/filters/range.blade.php @@ -100,7 +100,7 @@ class="dropdown {{ Request::get($filter->name)?'active':'' }}"> ajax_table.ajax.url(new_url).load(); // add filter to URL - window.history.pushState({}, 'Nice title', new_url.replace('/search', '')); + crud.updateUrl(new_url); // mark this filter as active in the navbar-filters if (URI(new_url).hasQuery('{{ $filter->name }}', true)) { diff --git a/src/resources/views/filters/select2.blade.php b/src/resources/views/filters/select2.blade.php index 21e1092780..f58edbe11c 100644 --- a/src/resources/views/filters/select2.blade.php +++ b/src/resources/views/filters/select2.blade.php @@ -90,7 +90,7 @@ class="dropdown {{ Request::get($filter->name)?'active':'' }}"> ajax_table.ajax.url(new_url).load(); // add filter to URL - window.history.pushState({}, 'Nice title', new_url.replace('/search', '')); + crud.updateUrl(new_url); // mark this filter as active in the navbar-filters if (URI(new_url).hasQuery('{{ $filter->name }}', true)) { diff --git a/src/resources/views/filters/select2_ajax.blade.php b/src/resources/views/filters/select2_ajax.blade.php index 96a1bb85a0..d6dafd1ac5 100644 --- a/src/resources/views/filters/select2_ajax.blade.php +++ b/src/resources/views/filters/select2_ajax.blade.php @@ -106,7 +106,7 @@ class="dropdown {{ Request::get($filter->name)?'active':'' }}"> ajax_table.ajax.url(new_url).load(); // add filter to URL - window.history.pushState({}, 'Nice title', new_url.replace('/search', '')); + crud.updateUrl(new_url); // mark this filter as active in the navbar-filters if (URI(new_url).hasQuery('{{ $filter->name }}', true)) { diff --git a/src/resources/views/filters/select2_multiple.blade.php b/src/resources/views/filters/select2_multiple.blade.php index 15348066a2..5988c79bf9 100644 --- a/src/resources/views/filters/select2_multiple.blade.php +++ b/src/resources/views/filters/select2_multiple.blade.php @@ -97,7 +97,7 @@ class="dropdown {{ Request::get($filter->name)?'active':'' }}"> ajax_table.ajax.url(new_url).load(); // add filter to URL - window.history.pushState({}, 'Nice title', new_url.replace('/search', '')); + crud.updateUrl(new_url); // mark this filter as active in the navbar-filters if (URI(new_url).hasQuery('{{ $filter->name }}', true)) { diff --git a/src/resources/views/filters/simple.blade.php b/src/resources/views/filters/simple.blade.php index aa88a5cf7a..13f31c8d5b 100644 --- a/src/resources/views/filters/simple.blade.php +++ b/src/resources/views/filters/simple.blade.php @@ -47,7 +47,7 @@ class="{{ Request::get($filter->name)?'active':'' }}"> ajax_table.ajax.url(new_url).load(); // add filter to URL - window.history.pushState({}, 'Nice title', new_url.replace('/search', '')); + crud.updateUrl(new_url); // mark this filter as active in the navbar-filters if (URI(new_url).hasQuery('{{ $filter->name }}', true)) { diff --git a/src/resources/views/filters/text.blade.php b/src/resources/views/filters/text.blade.php index bf07163a47..11f2ef1ae8 100644 --- a/src/resources/views/filters/text.blade.php +++ b/src/resources/views/filters/text.blade.php @@ -48,7 +48,7 @@ class="dropdown {{ Request::get($filter->name) ? 'active' : '' }}"> ajax_table.ajax.url(new_url).load(); // add filter to URL - window.history.pushState({}, 'Nice title', new_url.replace('/search', '')); + crud.updateUrl(new_url); // mark this filter as active in the navbar-filters if (URI(new_url).hasQuery('{{ $filter->name }}', true)) { diff --git a/src/resources/views/inc/datatables_logic.blade.php b/src/resources/views/inc/datatables_logic.blade.php index b1ec99321f..3e857d59cb 100644 --- a/src/resources/views/inc/datatables_logic.blade.php +++ b/src/resources/views/inc/datatables_logic.blade.php @@ -28,6 +28,9 @@ functionsToRunOnDataTablesDrawEvent: [], { fn = fn[ arr[i] ]; } fn.apply(window, args); }, + updateUrl : function (new_url) { + window.history.pushState({}, '', new_url.replace('/search?', '?')); + }, dataTableConfiguration: { @if ($crud->getResponsiveTable()) From 8fc513b641e0472515c927e79fa84d1bb735ec78 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 13 Nov 2018 20:00:31 +0200 Subject: [PATCH 079/124] separated persistent table into its own feature, which can be toggled --- src/PanelTraits/Search.php | 49 +++++++++++++++++++ src/config/backpack/crud.php | 14 ++++-- .../views/inc/datatables_logic.blade.php | 12 ++++- 3 files changed, 69 insertions(+), 6 deletions(-) diff --git a/src/PanelTraits/Search.php b/src/PanelTraits/Search.php index 37d30b709a..864a6b66cd 100644 --- a/src/PanelTraits/Search.php +++ b/src/PanelTraits/Search.php @@ -12,6 +12,7 @@ trait Search public $ajax_table = true; public $responsive_table; + public $persistent_table = false; /** * Add conditions to the CRUD query for a particular search term. @@ -106,6 +107,10 @@ public function ajaxTable() return $this->ajax_table; } + // ------------------------- + // Responsive Table + // ------------------------- + /** * Tell the list view to NOT show a reponsive DataTable. * @@ -146,6 +151,50 @@ public function disableResponsiveTable() $this->setResponsiveTable(false); } + // ------------------------- + // Persistent Table + // ------------------------- + + /** + * Tell the list view to NOT store datatable information in local storage. + * + * @param bool $value + */ + public function setPersistentTable($value = true) + { + $this->persistent_table = $value; + } + + /** + * Check if saved state is enabled for the table view. + * + * @return bool + */ + public function getPersistentTable() + { + if ($this->persistent_table !== null) { + return $this->persistent_table; + } + + return config('backpack.crud.persistent_table'); + } + + /** + * Remember to show a persistent table. + */ + public function enablePersistentTable() + { + $this->setPersistentTable(true); + } + + /** + * Remember to show a table that doesn't store URLs and pagination in local storage. + */ + public function disablePersistentTable() + { + $this->setPersistentTable(false); + } + /** * Get the HTML of the cells in a table row, for a certain DB entry. * diff --git a/src/config/backpack/crud.php b/src/config/backpack/crud.php index ec0788147f..dc47c25edd 100644 --- a/src/config/backpack/crud.php +++ b/src/config/backpack/crud.php @@ -51,15 +51,19 @@ // if not, a horizontal scrollbar will be shown instead 'responsive_table' => true, - // How many items should be shown by default by the Datatable? - // This value can be overwritten on a specific CRUD by calling - // $this->crud->setDefaultPageLength(50); - 'default_page_length' => 25, + // stores pagination and filters in localStorage for two hours + // whenever the user tries to see that page, backpack loads the previous pagination and filtration + 'persistent_table' => false, + + // How many items should be shown by default by the Datatable? + // This value can be overwritten on a specific CRUD by calling + // $this->crud->setDefaultPageLength(50); + 'default_page_length' => 25, // A 1D array of options which will be used for both the displayed option and the value, or // A 2D array in which the first array is used to define the value options and the second array the displayed options // If a 2D array is used, strings in the right hand array will be automatically run through trans() - 'page_length_menu' => [[10, 25, 50, 100, -1], [10, 25, 50, 100, 'backpack::crud.all']], + 'page_length_menu' => [[10, 25, 50, 100, -1], [10, 25, 50, 100, 'backpack::crud.all']], // Here you may override the css-class for the content section of the list view globally // To override per view use $this->crud->setListContentClass('class-string') diff --git a/src/resources/views/inc/datatables_logic.blade.php b/src/resources/views/inc/datatables_logic.blade.php index 3e857d59cb..3984c7e7da 100644 --- a/src/resources/views/inc/datatables_logic.blade.php +++ b/src/resources/views/inc/datatables_logic.blade.php @@ -7,6 +7,12 @@ https://cdn.datatables.net/fixedheader/3.1.5/js/dataTables.fixedHeader.min.js"> From 7402a91af53a33edb4f3f614d0040e752ec84231 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Wed, 14 Nov 2018 13:28:20 +0200 Subject: [PATCH 081/124] when using tabs, fields that do not belong in tabs also look good --- src/resources/views/inc/show_tabbed_fields.blade.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/resources/views/inc/show_tabbed_fields.blade.php b/src/resources/views/inc/show_tabbed_fields.blade.php index 07024eab13..ca12ba010f 100644 --- a/src/resources/views/inc/show_tabbed_fields.blade.php +++ b/src/resources/views/inc/show_tabbed_fields.blade.php @@ -19,7 +19,13 @@ @endpush -@include('crud::inc.show_fields', ['fields' => $crud->getFieldsWithoutATab()]) +@if ($crud->getFieldsWithoutATab()->filter(function ($value, $key) { return $value['type'] != 'hidden'; })->count()) +
                            +
                            + @include('crud::inc.show_fields', ['fields' => $crud->getFieldsWithoutATab()]) +
                            +
                            +@endif
                            From bc261322fd951a73796a2906cff89f6e591ca6ec Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Wed, 14 Nov 2018 15:14:07 +0200 Subject: [PATCH 082/124] unit tests for CrudPanel Views trait --- src/PanelTraits/Views.php | 10 + tests/Unit/CrudPanel/CrudPanelViewsTest.php | 278 ++++++++++++++++++++ 2 files changed, 288 insertions(+) create mode 100644 tests/Unit/CrudPanel/CrudPanelViewsTest.php diff --git a/src/PanelTraits/Views.php b/src/PanelTraits/Views.php index a12b37906e..3b8f989506 100644 --- a/src/PanelTraits/Views.php +++ b/src/PanelTraits/Views.php @@ -346,4 +346,14 @@ public function setUpdateView($view) { return $this->setEditView($view); } + + public function setUpdateContentClass(string $editContentClass) + { + return $this->setEditContentClass($editContentClass); + } + + public function getUpdateContentClass() + { + return $this->getEditContentClass(); + } } diff --git a/tests/Unit/CrudPanel/CrudPanelViewsTest.php b/tests/Unit/CrudPanel/CrudPanelViewsTest.php new file mode 100644 index 0000000000..c28906df53 --- /dev/null +++ b/tests/Unit/CrudPanel/CrudPanelViewsTest.php @@ -0,0 +1,278 @@ +crudPanel->setCreateView($this->customView); + $this->assertAttributeEquals($this->customView, 'createView', $this->crudPanel); + } + + public function testGetCreateView() + { + $this->crudPanel->setCreateView($this->customView); + $this->assertEquals($this->customView, $this->crudPanel->getCreateView()); + } + + public function testSetCreateContentClass() + { + $this->crudPanel->setCreateContentClass($this->customContentClass); + $this->assertAttributeEquals($this->customContentClass, 'createContentClass', $this->crudPanel); + } + + public function testGetCreateContentClass() + { + $this->crudPanel->setCreateContentClass($this->customContentClass); + $this->assertEquals($this->customContentClass, $this->crudPanel->getCreateContentClass()); + } + + public function testGetCreateContentClassFromConfig() + { + Config::set('backpack.crud.create_content_class', $this->customContentClass); + + $this->assertEquals(Config::get('backpack.crud.create_content_class'), $this->crudPanel->getCreateContentClass()); + } + + // UPDATE + + public function testSetEditView() + { + $this->crudPanel->setEditView($this->customView); + $this->assertAttributeEquals($this->customView, 'editView', $this->crudPanel); + } + + public function testGetEditView() + { + $this->crudPanel->setEditView($this->customView); + $this->assertEquals($this->customView, $this->crudPanel->getEditView()); + } + + public function testSetEditContentClass() + { + $this->crudPanel->setEditContentClass($this->customContentClass); + $this->assertAttributeEquals($this->customContentClass, 'editContentClass', $this->crudPanel); + } + + public function testGetEditContentClass() + { + $this->crudPanel->setEditContentClass($this->customContentClass); + $this->assertEquals($this->customContentClass, $this->crudPanel->getEditContentClass()); + } + + public function testGetEditContentClassFromConfig() + { + Config::set('backpack.crud.edit_content_class', $this->customContentClass); + + $this->assertEquals(Config::get('backpack.crud.edit_content_class'), $this->crudPanel->getEditContentClass()); + } + + public function testSetUpdateView() + { + $this->crudPanel->setUpdateView($this->customView); + $this->assertAttributeEquals($this->customView, 'editView', $this->crudPanel); + } + + public function testGetUpdateView() + { + $this->crudPanel->setEditView($this->customView); + $this->assertEquals($this->customView, $this->crudPanel->getUpdateView()); + } + + public function testSetUpdateContentClass() + { + $this->crudPanel->setUpdateContentClass($this->customContentClass); + $this->assertAttributeEquals($this->customContentClass, 'editContentClass', $this->crudPanel); + } + + public function testGetUpdateContentClass() + { + $this->crudPanel->setEditContentClass($this->customContentClass); + $this->assertEquals($this->customContentClass, $this->crudPanel->getUpdateContentClass()); + } + + public function testGetUpdateContentClassFromConfig() + { + Config::set('backpack.crud.edit_content_class', $this->customContentClass); + + $this->assertEquals(Config::get('backpack.crud.edit_content_class'), $this->crudPanel->getUpdateContentClass()); + } + + // SHOW + + public function testSetShowView() + { + $this->crudPanel->setShowView($this->customView); + $this->assertAttributeEquals($this->customView, 'showView', $this->crudPanel); + } + + public function testGetShowView() + { + $this->crudPanel->setShowView($this->customView); + $this->assertEquals($this->customView, $this->crudPanel->getShowView()); + } + + public function testSetShowContentClass() + { + $this->crudPanel->setShowContentClass($this->customContentClass); + $this->assertAttributeEquals($this->customContentClass, 'showContentClass', $this->crudPanel); + } + + public function testGetShowContentClass() + { + $this->crudPanel->setShowContentClass($this->customContentClass); + $this->assertEquals($this->customContentClass, $this->crudPanel->getShowContentClass()); + } + + public function testGetShowContentClassFromConfig() + { + Config::set('backpack.crud.show_content_class', $this->customContentClass); + + $this->assertEquals(Config::get('backpack.crud.show_content_class'), $this->crudPanel->getShowContentClass()); + } + + public function testSetPreviewView() + { + $this->crudPanel->setPreviewView($this->customView); + $this->assertAttributeEquals($this->customView, 'showView', $this->crudPanel); + } + + public function testGetPreviewView() + { + $this->crudPanel->setShowView($this->customView); + $this->assertEquals($this->customView, $this->crudPanel->getPreviewView()); + } + + // LIST ENTRIES + + public function testSetListView() + { + $this->crudPanel->setListView($this->customView); + $this->assertAttributeEquals($this->customView, 'listView', $this->crudPanel); + } + + public function testGetListView() + { + $this->crudPanel->setListView($this->customView); + $this->assertEquals($this->customView, $this->crudPanel->getListView()); + } + + public function testSetListContentClass() + { + $this->crudPanel->setListContentClass($this->customContentClass); + $this->assertAttributeEquals($this->customContentClass, 'listContentClass', $this->crudPanel); + } + + public function testGetListContentClass() + { + $this->crudPanel->setListContentClass($this->customContentClass); + $this->assertEquals($this->customContentClass, $this->crudPanel->getListContentClass()); + } + + public function testGetListContentClassFromConfig() + { + Config::set('backpack.crud.list_content_class', $this->customContentClass); + + $this->assertEquals(Config::get('backpack.crud.list_content_class'), $this->crudPanel->getListContentClass()); + } + + // DETAILS ROW + + public function testSetDetailsRowView() + { + $this->crudPanel->setDetailsRowView($this->customView); + $this->assertAttributeEquals($this->customView, 'detailsRowView', $this->crudPanel); + } + + public function testGetDetailsRowView() + { + $this->crudPanel->setDetailsRowView($this->customView); + $this->assertEquals($this->customView, $this->crudPanel->getDetailsRowView()); + } + + // REORDER + + public function testSetReorderView() + { + $this->crudPanel->setReorderView($this->customView); + $this->assertAttributeEquals($this->customView, 'reorderView', $this->crudPanel); + } + + public function testGetReorderView() + { + $this->crudPanel->setReorderView($this->customView); + $this->assertEquals($this->customView, $this->crudPanel->getReorderView()); + } + + public function testSetReorderContentClass() + { + $this->crudPanel->setReorderContentClass($this->customContentClass); + $this->assertAttributeEquals($this->customContentClass, 'reorderContentClass', $this->crudPanel); + } + + public function testGetReorderContentClass() + { + $this->crudPanel->setReorderContentClass($this->customContentClass); + $this->assertEquals($this->customContentClass, $this->crudPanel->getReorderContentClass()); + } + + public function testGetReorderContentClassFromConfig() + { + Config::set('backpack.crud.reorder_content_class', $this->customContentClass); + + $this->assertEquals(Config::get('backpack.crud.reorder_content_class'), $this->crudPanel->getReorderContentClass()); + } + + // REVISIONS + + public function testSetRevisionsView() + { + $this->crudPanel->setRevisionsView($this->customView); + $this->assertAttributeEquals($this->customView, 'revisionsView', $this->crudPanel); + } + + public function testGetRevisionsView() + { + $this->crudPanel->setRevisionsView($this->customView); + $this->assertEquals($this->customView, $this->crudPanel->getRevisionsView()); + } + + public function testSetRevisionsTimelineView() + { + $this->crudPanel->setRevisionsTimelineView($this->customView); + $this->assertAttributeEquals($this->customView, 'revisionsTimelineView', $this->crudPanel); + } + + public function testGetRevisionsTimelineView() + { + $this->crudPanel->setRevisionsTimelineView($this->customView); + $this->assertEquals($this->customView, $this->crudPanel->getRevisionsTimelineView()); + } + + public function testSetRevisionsTimelineContentClass() + { + $this->crudPanel->setRevisionsTimelineContentClass($this->customContentClass); + $this->assertAttributeEquals($this->customContentClass, 'revisionsTimelineContentClass', $this->crudPanel); + } + + public function testGetRevisionsTimelineContentClass() + { + $this->crudPanel->setRevisionsTimelineContentClass($this->customContentClass); + $this->assertEquals($this->customContentClass, $this->crudPanel->getRevisionsTimelineContentClass()); + } + + public function testGetRevisionsTimelineContentClassFromConfig() + { + Config::set('backpack.crud.revisions_timeline_content_class', $this->customContentClass); + + $this->assertEquals(Config::get('backpack.crud.revisions_timeline_content_class'), $this->crudPanel->getRevisionsTimelineContentClass()); + } +} From 42a52c9aef5698bc320e3d83a0360a9265e7c378 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Thu, 15 Nov 2018 10:23:29 +0200 Subject: [PATCH 083/124] added exportable option to columns --- src/PanelTraits/Read.php | 2 ++ src/resources/views/inc/export_buttons.blade.php | 15 +++++++++------ src/resources/views/list.blade.php | 3 ++- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/PanelTraits/Read.php b/src/PanelTraits/Read.php index d564bff3bd..37615bf622 100644 --- a/src/PanelTraits/Read.php +++ b/src/PanelTraits/Read.php @@ -178,6 +178,7 @@ public function enableBulkActions() 'searchLogic' => false, 'orderable' => false, 'visibleInModal' => false, + 'exportable' => false, ])->makeFirstColumn(); $this->addColumn([ @@ -188,6 +189,7 @@ public function enableBulkActions() 'searchLogic' => false, 'orderable' => false, 'visibleInModal' => false, + 'exportable' => false, ])->makeFirstColumn(); } diff --git a/src/resources/views/inc/export_buttons.blade.php b/src/resources/views/inc/export_buttons.blade.php index cd46937766..272b619113 100644 --- a/src/resources/views/inc/export_buttons.blade.php +++ b/src/resources/views/inc/export_buttons.blade.php @@ -9,12 +9,15 @@ +@endpush \ No newline at end of file diff --git a/src/resources/views/buttons/clone.blade.php b/src/resources/views/buttons/clone.blade.php new file mode 100644 index 0000000000..793c1de42c --- /dev/null +++ b/src/resources/views/buttons/clone.blade.php @@ -0,0 +1,45 @@ +@if ($crud->hasAccess('create')) + Clone +@endif + + \ No newline at end of file From c1bbeac8102d0a5d519863f004273eb55a851a50 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Fri, 16 Nov 2018 09:57:32 +0200 Subject: [PATCH 099/124] Apply fixes from StyleCI (#1707) [ci skip] [skip ci] --- src/app/Http/Controllers/CrudController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/Http/Controllers/CrudController.php b/src/app/Http/Controllers/CrudController.php index 939347d711..8aa6e884cc 100644 --- a/src/app/Http/Controllers/CrudController.php +++ b/src/app/Http/Controllers/CrudController.php @@ -6,7 +6,6 @@ use Illuminate\Http\Request; use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Routing\Controller as BaseController; -use Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation; use Backpack\CRUD\app\Http\Controllers\Operations\Show; use Illuminate\Foundation\Validation\ValidatesRequests; use Backpack\CRUD\app\Http\Controllers\Operations\Create; @@ -16,6 +15,7 @@ use Backpack\CRUD\app\Http\Controllers\Operations\Revisions; use Backpack\CRUD\app\Http\Controllers\Operations\ListEntries; use Backpack\CRUD\app\Http\Controllers\Operations\SaveActions; +use Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation; class CrudController extends BaseController { From 66126c21c121af89e256103386f661df48a04abd Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Fri, 16 Nov 2018 10:04:35 +0200 Subject: [PATCH 100/124] added clone access and button as default --- src/PanelTraits/Buttons.php | 1 + src/app/Http/Controllers/Operations/CloneOperation.php | 4 ++-- src/resources/views/buttons/bulk_clone.blade.php | 2 +- src/resources/views/buttons/clone.blade.php | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/PanelTraits/Buttons.php b/src/PanelTraits/Buttons.php index 64e2acbd31..f4d397f10f 100644 --- a/src/PanelTraits/Buttons.php +++ b/src/PanelTraits/Buttons.php @@ -85,6 +85,7 @@ public function initButtons() $this->addButton('line', 'show', 'view', 'crud::buttons.show', 'end'); $this->addButton('line', 'update', 'view', 'crud::buttons.update', 'end'); $this->addButton('line', 'revisions', 'view', 'crud::buttons.revisions', 'end'); + $this->addButton('line', 'clone', 'view', 'crud::buttons.clone', 'end'); $this->addButton('line', 'delete', 'view', 'crud::buttons.delete', 'end'); // top stack diff --git a/src/app/Http/Controllers/Operations/CloneOperation.php b/src/app/Http/Controllers/Operations/CloneOperation.php index 82adf53dfd..455d0d828a 100644 --- a/src/app/Http/Controllers/Operations/CloneOperation.php +++ b/src/app/Http/Controllers/Operations/CloneOperation.php @@ -13,7 +13,7 @@ trait CloneOperation */ public function clone($id) { - $this->crud->hasAccessOrFail('create'); + $this->crud->hasAccessOrFail('clone'); $clonedEntry = $this->crud->model->findOrFail($id)->replicate(); @@ -29,7 +29,7 @@ public function clone($id) */ public function bulkClone() { - $this->crud->hasAccessOrFail('create'); + $this->crud->hasAccessOrFail('clone'); $entries = $this->request->input('entries'); $clonedEntries = []; diff --git a/src/resources/views/buttons/bulk_clone.blade.php b/src/resources/views/buttons/bulk_clone.blade.php index c877390a66..ef74e35e2f 100644 --- a/src/resources/views/buttons/bulk_clone.blade.php +++ b/src/resources/views/buttons/bulk_clone.blade.php @@ -1,4 +1,4 @@ -@if ($crud->hasAccess('create') && $crud->bulk_actions) +@if ($crud->hasAccess('clone') && $crud->bulk_actions) Clone @endif diff --git a/src/resources/views/buttons/clone.blade.php b/src/resources/views/buttons/clone.blade.php index 793c1de42c..b3138cd1ad 100644 --- a/src/resources/views/buttons/clone.blade.php +++ b/src/resources/views/buttons/clone.blade.php @@ -1,4 +1,4 @@ -@if ($crud->hasAccess('create')) +@if ($crud->hasAccess('clone')) Clone @endif From 735f967a340a62040095453fe4ecde4bbf4e0052 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Fri, 16 Nov 2018 10:16:30 +0200 Subject: [PATCH 101/124] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11439d2679..55259c1d7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ All Notable changes to `Backpack CRUD` will be documented in this file - #1704 - added ```orderLogic``` option for columns; - #1694 - ```options``` option to ```select```, ```select2```, ```select_multiple```, ```select2_multiple```, that allows developers to filter or order the options shown, using a scope or custom query; - #1695 - added ```select_and_order``` field type; +- #1708 - added ```Clone``` operation; ### Fixed - #1390 - using our own helper ```mb_ucfirst()``` instead of ```ucfirst()```; From a08600c09a70c2a84b35afe0c4dcc927b9bf88c2 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Fri, 16 Nov 2018 10:37:02 +0200 Subject: [PATCH 102/124] fixes #1560 - assuming ConvertEmptyStringsToNull when using mysql strict mode --- src/app/Http/Controllers/Operations/Create.php | 7 ------- src/app/Http/Controllers/Operations/Update.php | 7 ------- 2 files changed, 14 deletions(-) diff --git a/src/app/Http/Controllers/Operations/Create.php b/src/app/Http/Controllers/Operations/Create.php index 08f7470e57..3d00a53e40 100644 --- a/src/app/Http/Controllers/Operations/Create.php +++ b/src/app/Http/Controllers/Operations/Create.php @@ -43,13 +43,6 @@ public function storeCrud(StoreRequest $request = null) $request = \Request::instance(); } - // replace empty values with NULL, so that it will work with MySQL strict mode on - foreach ($request->input() as $key => $value) { - if (empty($value) && $value !== '0') { - $request->request->set($key, null); - } - } - // insert item in the db $item = $this->crud->create($request->except(['save_action', '_token', '_method', 'current_tab'])); $this->data['entry'] = $this->crud->entry = $item; diff --git a/src/app/Http/Controllers/Operations/Update.php b/src/app/Http/Controllers/Operations/Update.php index 734c269af4..a06affb7c7 100644 --- a/src/app/Http/Controllers/Operations/Update.php +++ b/src/app/Http/Controllers/Operations/Update.php @@ -51,13 +51,6 @@ public function updateCrud(UpdateRequest $request = null) $request = \Request::instance(); } - // replace empty values with NULL, so that it will work with MySQL strict mode on - foreach ($request->input() as $key => $value) { - if (empty($value) && $value !== '0') { - $request->request->set($key, null); - } - } - // update the row in the db $item = $this->crud->update($request->get($this->crud->model->getKeyName()), $request->except('save_action', '_token', '_method', 'current_tab')); From 7ef11889220409d7b02f27c23ae68f75826951f1 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Fri, 16 Nov 2018 10:48:47 +0200 Subject: [PATCH 103/124] fixed buttons unit tests - broken by adding the clone button --- tests/Unit/CrudPanel/CrudPanelButtonsTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Unit/CrudPanel/CrudPanelButtonsTest.php b/tests/Unit/CrudPanel/CrudPanelButtonsTest.php index 7a9d5ae01f..8e41d44877 100644 --- a/tests/Unit/CrudPanel/CrudPanelButtonsTest.php +++ b/tests/Unit/CrudPanel/CrudPanelButtonsTest.php @@ -7,7 +7,7 @@ class CrudPanelButtonsTest extends BaseCrudPanelTest { private $defaultButtonNames = [ - 'show', 'update', 'revisions', 'delete', 'create', 'reorder', + 'show', 'update', 'revisions', 'delete', 'create', 'reorder', 'clone', ]; private $topViewButton; From 1ffffe91f97ad5f2bcd3b3b3364011316d9cf980 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 20 Nov 2018 11:07:16 +0200 Subject: [PATCH 104/124] changed google places api key config location --- src/resources/views/fields/address_google.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resources/views/fields/address_google.blade.php b/src/resources/views/fields/address_google.blade.php index 678da664ba..e69e9f35df 100644 --- a/src/resources/views/fields/address_google.blade.php +++ b/src/resources/views/fields/address_google.blade.php @@ -115,7 +115,7 @@ function initAutocomplete() { } - @endpush From 90a1b7c0f403086a9d57d4f447fcae03386a0827 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 20 Nov 2018 11:09:12 +0200 Subject: [PATCH 105/124] renamed address field to address_algolia with backwards-compatible alias --- src/resources/views/fields/address.blade.php | 109 +----------------- .../views/fields/address_algolia.blade.php | 108 +++++++++++++++++ 2 files changed, 109 insertions(+), 108 deletions(-) create mode 100644 src/resources/views/fields/address_algolia.blade.php diff --git a/src/resources/views/fields/address.blade.php b/src/resources/views/fields/address.blade.php index 68fb27cb42..4323e3093f 100644 --- a/src/resources/views/fields/address.blade.php +++ b/src/resources/views/fields/address.blade.php @@ -1,108 +1 @@ - - - - -
                            - - @include('crud::inc.field_translatable_icon') - - - @if(isset($field['prefix']) || isset($field['suffix']))
                            @endif - @if(isset($field['prefix']))
                            {!! $field['prefix'] !!}
                            @endif - @if(isset($field['store_as_json']) && $field['store_as_json']) - - @else - - @endif - @if(isset($field['suffix']))
                            {!! $field['suffix'] !!}
                            @endif - @if(isset($field['prefix']) || isset($field['suffix']))
                            @endif - - {{-- HINT --}} - @if (isset($field['hint'])) -

                            {!! $field['hint'] !!}

                            - @endif -
                            - -{{-- Note: you can use to only load some CSS/JS once, even though there are multiple instances of it --}} - -{{-- ########################################## --}} -{{-- Extra CSS and JS for this particular field --}} -{{-- If a field type is shown multiple times on a form, the CSS and JS will only be loaded once --}} -@if ($crud->checkIfFieldIsFirstOfItsType($field)) - - {{-- FIELD CSS - will be loaded in the after_styles section --}} - @push('crud_fields_styles') - - @endpush - - {{-- FIELD JS - will be loaded in the after_scripts section --}} - @push('crud_fields_scripts') - - - @endpush - -@endif -{{-- End of Extra CSS and JS --}} -{{-- ########################################## --}} +@include('crud::fields.address_algolia') \ No newline at end of file diff --git a/src/resources/views/fields/address_algolia.blade.php b/src/resources/views/fields/address_algolia.blade.php new file mode 100644 index 0000000000..68fb27cb42 --- /dev/null +++ b/src/resources/views/fields/address_algolia.blade.php @@ -0,0 +1,108 @@ + + + + +
                            + + @include('crud::inc.field_translatable_icon') + + + @if(isset($field['prefix']) || isset($field['suffix']))
                            @endif + @if(isset($field['prefix']))
                            {!! $field['prefix'] !!}
                            @endif + @if(isset($field['store_as_json']) && $field['store_as_json']) + + @else + + @endif + @if(isset($field['suffix']))
                            {!! $field['suffix'] !!}
                            @endif + @if(isset($field['prefix']) || isset($field['suffix']))
                            @endif + + {{-- HINT --}} + @if (isset($field['hint'])) +

                            {!! $field['hint'] !!}

                            + @endif +
                            + +{{-- Note: you can use to only load some CSS/JS once, even though there are multiple instances of it --}} + +{{-- ########################################## --}} +{{-- Extra CSS and JS for this particular field --}} +{{-- If a field type is shown multiple times on a form, the CSS and JS will only be loaded once --}} +@if ($crud->checkIfFieldIsFirstOfItsType($field)) + + {{-- FIELD CSS - will be loaded in the after_styles section --}} + @push('crud_fields_styles') + + @endpush + + {{-- FIELD JS - will be loaded in the after_scripts section --}} + @push('crud_fields_scripts') + + + @endpush + +@endif +{{-- End of Extra CSS and JS --}} +{{-- ########################################## --}} From fce44c0ab4a816e78a14dacd7a61fa3f6ad59a63 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 20 Nov 2018 11:14:07 +0200 Subject: [PATCH 106/124] removed conflict with algolia input --- src/resources/views/fields/address_google.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/resources/views/fields/address_google.blade.php b/src/resources/views/fields/address_google.blade.php index e69e9f35df..9470bcdac3 100644 --- a/src/resources/views/fields/address_google.blade.php +++ b/src/resources/views/fields/address_google.blade.php @@ -23,13 +23,13 @@ @if(isset($field['store_as_json']) && $field['store_as_json']) @else Date: Tue, 20 Nov 2018 11:26:36 +0200 Subject: [PATCH 107/124] removed google places api key from config file --- src/config/backpack/crud.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/config/backpack/crud.php b/src/config/backpack/crud.php index 2090209325..47a1841295 100644 --- a/src/config/backpack/crud.php +++ b/src/config/backpack/crud.php @@ -69,14 +69,6 @@ |------------ */ - /* - |------------ - | API KEYS - |------------ - */ - - 'google_places_api_key' => env('GOOGLE_PLACES_API_KEY'), //Only needed if you use the address_google field - /* |------------------- | TRANSLATABLE CRUDS From 903712bddc414c688d697cb67b26859a947bad7e Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 20 Nov 2018 11:28:57 +0200 Subject: [PATCH 108/124] changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55259c1d7c..8089adaefe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,11 +40,12 @@ All Notable changes to `Backpack CRUD` will be documented in this file - #1694 - ```options``` option to ```select```, ```select2```, ```select_multiple```, ```select2_multiple```, that allows developers to filter or order the options shown, using a scope or custom query; - #1695 - added ```select_and_order``` field type; - #1708 - added ```Clone``` operation; +- #1712 - added ```address_google``` field type; ### Fixed - #1390 - using our own helper ```mb_ucfirst()``` instead of ```ucfirst()```; - #791 - could not revert changes made in fake field holders; - +- #1712 - renamed ```address``` field type to ```address_algolia```; alias keeps backwards-compatibility; ---- From ca4f6184c52e3b494a42089ab216f907c371eb8e Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 20 Nov 2018 12:36:24 +0200 Subject: [PATCH 109/124] Apply fixes from StyleCI (#1713) [ci skip] [skip ci] --- src/PanelTraits/AutoSet.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/PanelTraits/AutoSet.php b/src/PanelTraits/AutoSet.php index cff086fe87..5b414780ee 100644 --- a/src/PanelTraits/AutoSet.php +++ b/src/PanelTraits/AutoSet.php @@ -72,8 +72,7 @@ public function getDbColumnTypes() */ public function getTableColumns() { - if (isset($this->table_columns) && $this->table_columns) - { + if (isset($this->table_columns) && $this->table_columns) { return $this->table_columns; } @@ -218,7 +217,7 @@ public function getDbColumnsNames() $columns = array_keys($this->getTableColumns()); $fillable = $this->model->getFillable(); - if (!empty($fillable)) { + if (! empty($fillable)) { $columns = array_intersect($columns, $fillable); } From 666b18e32a667cae25249b0f72cb7763990a0c62 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 20 Nov 2018 12:50:05 +0200 Subject: [PATCH 110/124] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8089adaefe..f6776a0b73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,7 @@ All Notable changes to `Backpack CRUD` will be documented in this file - #1390 - using our own helper ```mb_ucfirst()``` instead of ```ucfirst()```; - #791 - could not revert changes made in fake field holders; - #1712 - renamed ```address``` field type to ```address_algolia```; alias keeps backwards-compatibility; +- #1714 - autoset getting tables now happens only once; ---- From 3e0cd36cff7cdf9e3164ae146b13a372c5bc97c9 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 20 Nov 2018 12:50:28 +0200 Subject: [PATCH 111/124] Apply fixes from StyleCI (#1715) [ci skip] [skip ci] --- src/PanelTraits/AutoSet.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/PanelTraits/AutoSet.php b/src/PanelTraits/AutoSet.php index cff086fe87..5b414780ee 100644 --- a/src/PanelTraits/AutoSet.php +++ b/src/PanelTraits/AutoSet.php @@ -72,8 +72,7 @@ public function getDbColumnTypes() */ public function getTableColumns() { - if (isset($this->table_columns) && $this->table_columns) - { + if (isset($this->table_columns) && $this->table_columns) { return $this->table_columns; } @@ -218,7 +217,7 @@ public function getDbColumnsNames() $columns = array_keys($this->getTableColumns()); $fillable = $this->model->getFillable(); - if (!empty($fillable)) { + if (! empty($fillable)) { $columns = array_intersect($columns, $fillable); } From 5f092cbeeb4cfefa5b78546455b39c327f333212 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 20 Nov 2018 13:16:12 +0200 Subject: [PATCH 112/124] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6abe677861..aa6e1b3d62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ All Notable changes to `Backpack CRUD` will be documented in this file - #791 - could not revert changes made in fake field holders; - #1712 - renamed ```address``` field type to ```address_algolia```; alias keeps backwards-compatibility; - #1714 - autoset getting tables now happens only once; +- #1692 - we can now use arrays for field names, like ```category[0][name]```, the only thing that needed to be fixed was the ```old()``` value which did not work; ---- From f2a6de9c5d86488e36898562b936f3edfbc025ca Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 20 Nov 2018 13:27:25 +0200 Subject: [PATCH 113/124] added ability to pass parameters to model_function column --- src/resources/views/columns/model_function.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resources/views/columns/model_function.blade.php b/src/resources/views/columns/model_function.blade.php index 84f9780ebd..2f9c45e8fa 100644 --- a/src/resources/views/columns/model_function.blade.php +++ b/src/resources/views/columns/model_function.blade.php @@ -1,6 +1,6 @@ {{-- custom return value --}} @php - $value = $entry->{$column['function_name']}(); + $value = $entry->{$column['function_name']}(...($column['function_parameters'] ?? [])); @endphp From 31f0e693db39c82fa217293e4b290b0d80f97b95 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 20 Nov 2018 13:31:14 +0200 Subject: [PATCH 114/124] parameters for model function attribute column type --- src/resources/views/columns/model_function_attribute.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resources/views/columns/model_function_attribute.blade.php b/src/resources/views/columns/model_function_attribute.blade.php index 3fdbdc5398..ded900db36 100644 --- a/src/resources/views/columns/model_function_attribute.blade.php +++ b/src/resources/views/columns/model_function_attribute.blade.php @@ -1,6 +1,6 @@ {{-- custom return value via attribute --}} @php - $value = @$entry->{$column['function_name']}(...($column['function_parameters']?:[]))->{$column['attribute']} + $value = $entry->{$column['function_name']}(...($column['function_parameters'] ?? []))->{$column['attribute']}; @endphp {{ (array_key_exists('prefix', $column) ? $column['prefix'] : '').str_limit($value, array_key_exists('limit', $column) ? $column['limit'] : 50, "[...]").(array_key_exists('suffix', $column) ? $column['suffix'] : '') }} From 2bc68596418a70203ce41190b098a2d9a178c68e Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 20 Nov 2018 13:32:27 +0200 Subject: [PATCH 115/124] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa6e1b3d62..488e034dd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ All Notable changes to `Backpack CRUD` will be documented in this file - #1695 - added ```select_and_order``` field type; - #1708 - added ```Clone``` operation; - #1712 - added ```address_google``` field type; +- #1674 - you can now pass parameters to ```model_function``` and ```model_function_attribute``` column types; ### Fixed - #1390 - using our own helper ```mb_ucfirst()``` instead of ```ucfirst()```; From 7143bdfb0bfcd0f83a2e804242a6f288405c4d75 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 20 Nov 2018 16:58:43 +0200 Subject: [PATCH 116/124] added ability to clear input when dependencies change --- src/resources/views/fields/select2_from_ajax.blade.php | 8 ++++++++ .../views/fields/select2_from_ajax_multiple.blade.php | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/src/resources/views/fields/select2_from_ajax.blade.php b/src/resources/views/fields/select2_from_ajax.blade.php index c408f1dc47..b1c0c34e5c 100644 --- a/src/resources/views/fields/select2_from_ajax.blade.php +++ b/src/resources/views/fields/select2_from_ajax.blade.php @@ -134,6 +134,14 @@ } }); + + @if (isset($field['dependencies'])) + @foreach (array_wrap($field['dependencies']) as $dependency) + $('input[name={{ $dependency }}], select[name={{ $dependency }}], checkbox[name={{ $dependency }}], radio[name={{ $dependency }}], textarea[name={{ $dependency }}]').change(function () { + $("#select2_ajax_{{ $field['name'] }}").val(null).trigger("change"); + }); + @endforeach + @endif }); @endpush diff --git a/src/resources/views/fields/select2_from_ajax_multiple.blade.php b/src/resources/views/fields/select2_from_ajax_multiple.blade.php index d96a2d3e97..804970ee98 100644 --- a/src/resources/views/fields/select2_from_ajax_multiple.blade.php +++ b/src/resources/views/fields/select2_from_ajax_multiple.blade.php @@ -102,6 +102,15 @@ }); } }); + + + @if (isset($field['dependencies'])) + @foreach (array_wrap($field['dependencies']) as $dependency) + $('input[name={{ $dependency }}], select[name={{ $dependency }}], checkbox[name={{ $dependency }}], radio[name={{ $dependency }}], textarea[name={{ $dependency }}]').change(function () { + $("#select2_ajax_multiple_{{ $field['name'] }}").val(null).trigger("change"); + }); + @endforeach + @endif }); @endpush From 4cea798adceb46dac4444cb80410fb419984ef7a Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 20 Nov 2018 17:13:18 +0200 Subject: [PATCH 117/124] added method attribute to ajax selects --- src/resources/views/fields/select2_from_ajax.blade.php | 1 + src/resources/views/fields/select2_from_ajax_multiple.blade.php | 1 + 2 files changed, 2 insertions(+) diff --git a/src/resources/views/fields/select2_from_ajax.blade.php b/src/resources/views/fields/select2_from_ajax.blade.php index b1c0c34e5c..8d4e58693b 100644 --- a/src/resources/views/fields/select2_from_ajax.blade.php +++ b/src/resources/views/fields/select2_from_ajax.blade.php @@ -92,6 +92,7 @@ @endif ajax: { url: "{{ $field['data_source'] }}", + type: '{{ $field['method'] ?? 'GET' }}', dataType: 'json', quietMillis: 250, data: function (params) { diff --git a/src/resources/views/fields/select2_from_ajax_multiple.blade.php b/src/resources/views/fields/select2_from_ajax_multiple.blade.php index 804970ee98..7cdaa85673 100644 --- a/src/resources/views/fields/select2_from_ajax_multiple.blade.php +++ b/src/resources/views/fields/select2_from_ajax_multiple.blade.php @@ -73,6 +73,7 @@ minimumInputLength: "{{ $field['minimum_input_length'] }}", ajax: { url: "{{ $field['data_source'] }}", + type: '{{ $field['method'] ?? 'GET' }}', dataType: 'json', quietMillis: 250, data: function (params) { From 6b2bb2df9811fd9a78d43d94130cd584ae4911c2 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 20 Nov 2018 17:16:46 +0200 Subject: [PATCH 118/124] changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 488e034dd6..1c59179c63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,9 @@ All Notable changes to `Backpack CRUD` will be documented in this file - #1708 - added ```Clone``` operation; - #1712 - added ```address_google``` field type; - #1674 - you can now pass parameters to ```model_function``` and ```model_function_attribute``` column types; +- #1484 - added dependant select2s with ajax; +- #1484 - added ```method``` attribute to ajax select2s; +- #1484 - added ```dependencies``` attribute to ajax select2s; ### Fixed - #1390 - using our own helper ```mb_ucfirst()``` instead of ```ucfirst()```; From 62b2c8ba4e01c1d7ce8b061e7eefd716ab64331f Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 20 Nov 2018 17:36:58 +0200 Subject: [PATCH 119/124] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c59179c63..80766255d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,7 @@ All Notable changes to `Backpack CRUD` will be documented in this file - #1484 - added dependant select2s with ajax; - #1484 - added ```method``` attribute to ajax select2s; - #1484 - added ```dependencies``` attribute to ajax select2s; +- #1702 - added ```persistent_table``` functionality, and save state datatables; ### Fixed - #1390 - using our own helper ```mb_ucfirst()``` instead of ```ucfirst()```; From 0622f8e10b4a63ca16a032aa46c1535b48cd3ec4 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 20 Nov 2018 18:04:39 +0200 Subject: [PATCH 120/124] renamed getTableColumns to getDbTableColumns --- src/PanelTraits/AutoSet.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PanelTraits/AutoSet.php b/src/PanelTraits/AutoSet.php index 5b414780ee..29d4137d02 100644 --- a/src/PanelTraits/AutoSet.php +++ b/src/PanelTraits/AutoSet.php @@ -56,7 +56,7 @@ public function setFromDb() */ public function getDbColumnTypes() { - foreach ($this->getTableColumns() as $key => $column) { + foreach ($this->getDbTableColumns() as $key => $column) { $column_type = $column->getType()->getName(); $this->db_column_types[$column->getName()]['type'] = trim(preg_replace('/\(\d+\)(.*)/i', '', $column_type)); $this->db_column_types[$column->getName()]['default'] = $column->getDefault(); @@ -70,7 +70,7 @@ public function getDbColumnTypes() * * @return array */ - public function getTableColumns() + public function getDbTableColumns() { if (isset($this->table_columns) && $this->table_columns) { return $this->table_columns; @@ -214,7 +214,7 @@ public function setLabeller(callable $labeller) public function getDbColumnsNames() { // Automatically-set columns should be both in the database, and in the $fillable variable on the Eloquent Model - $columns = array_keys($this->getTableColumns()); + $columns = array_keys($this->getDbTableColumns()); $fillable = $this->model->getFillable(); if (! empty($fillable)) { From 7d8312b4d8e2e65fca133ea3fe8a299ae3a327b5 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Tue, 20 Nov 2018 18:25:44 +0200 Subject: [PATCH 121/124] fixed unit tests --- src/PanelTraits/AutoSet.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/PanelTraits/AutoSet.php b/src/PanelTraits/AutoSet.php index 29d4137d02..d692fac716 100644 --- a/src/PanelTraits/AutoSet.php +++ b/src/PanelTraits/AutoSet.php @@ -130,9 +130,6 @@ public function getFieldTypeFromDbColumnType($field) break; case 'text': - return 'textarea'; - break; - case 'mediumtext': case 'longtext': return 'textarea'; @@ -146,6 +143,7 @@ public function getFieldTypeFromDbColumnType($field) case 'timestamp': return 'datetime'; break; + case 'time': return 'time'; break; @@ -214,7 +212,7 @@ public function setLabeller(callable $labeller) public function getDbColumnsNames() { // Automatically-set columns should be both in the database, and in the $fillable variable on the Eloquent Model - $columns = array_keys($this->getDbTableColumns()); + $columns = $this->model->getConnection()->getSchemaBuilder()->getColumnListing($this->model->getTable()); $fillable = $this->model->getFillable(); if (! empty($fillable)) { From e373230516d4647abe03b864566a7fa9a9c96853 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Thu, 22 Nov 2018 19:20:01 +0200 Subject: [PATCH 122/124] renamed operations --- src/app/Http/Controllers/CrudController.php | 16 ++++++++-------- .../Controllers/Operations/CloneOperation.php | 2 ++ .../{Create.php => CreateOperation.php} | 6 +++--- .../{Delete.php => DeleteOperation.php} | 6 +++--- .../{ListEntries.php => ListOperation.php} | 8 ++++---- .../{Reorder.php => ReorderOperation.php} | 6 +++--- .../{Revisions.php => RevisionsOperation.php} | 6 +++--- .../Operations/{Show.php => ShowOperation.php} | 4 ++-- .../{Update.php => UpdateOperation.php} | 6 +++--- 9 files changed, 31 insertions(+), 29 deletions(-) rename src/app/Http/Controllers/Operations/{Create.php => CreateOperation.php} (94%) rename src/app/Http/Controllers/Operations/{Delete.php => DeleteOperation.php} (89%) rename src/app/Http/Controllers/Operations/{ListEntries.php => ListOperation.php} (95%) rename src/app/Http/Controllers/Operations/{Reorder.php => ReorderOperation.php} (92%) rename src/app/Http/Controllers/Operations/{Revisions.php => RevisionsOperation.php} (94%) rename src/app/Http/Controllers/Operations/{Show.php => ShowOperation.php} (96%) rename src/app/Http/Controllers/Operations/{Update.php => UpdateOperation.php} (94%) diff --git a/src/app/Http/Controllers/CrudController.php b/src/app/Http/Controllers/CrudController.php index 8aa6e884cc..5dac448686 100644 --- a/src/app/Http/Controllers/CrudController.php +++ b/src/app/Http/Controllers/CrudController.php @@ -6,21 +6,21 @@ use Illuminate\Http\Request; use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Routing\Controller as BaseController; -use Backpack\CRUD\app\Http\Controllers\Operations\Show; +use Backpack\CRUD\app\Http\Controllers\Operations\ShowOperation; use Illuminate\Foundation\Validation\ValidatesRequests; -use Backpack\CRUD\app\Http\Controllers\Operations\Create; -use Backpack\CRUD\app\Http\Controllers\Operations\Delete; -use Backpack\CRUD\app\Http\Controllers\Operations\Update; -use Backpack\CRUD\app\Http\Controllers\Operations\Reorder; -use Backpack\CRUD\app\Http\Controllers\Operations\Revisions; -use Backpack\CRUD\app\Http\Controllers\Operations\ListEntries; +use Backpack\CRUD\app\Http\Controllers\Operations\CreateOperation; +use Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation; +use Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation; +use Backpack\CRUD\app\Http\Controllers\Operations\ReorderOperation; +use Backpack\CRUD\app\Http\Controllers\Operations\RevisionsOperation; +use Backpack\CRUD\app\Http\Controllers\Operations\ListOperation; use Backpack\CRUD\app\Http\Controllers\Operations\SaveActions; use Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation; class CrudController extends BaseController { use DispatchesJobs, ValidatesRequests; - use Create, CloneOperation, Delete, ListEntries, Reorder, Revisions, SaveActions, Show, Update; + use CreateOperation, CloneOperation, DeleteOperation, ListOperation, ReorderOperation, RevisionsOperation, SaveActions, ShowOperation, UpdateOperation; public $data = []; public $request; diff --git a/src/app/Http/Controllers/Operations/CloneOperation.php b/src/app/Http/Controllers/Operations/CloneOperation.php index 455d0d828a..6d40585ea9 100644 --- a/src/app/Http/Controllers/Operations/CloneOperation.php +++ b/src/app/Http/Controllers/Operations/CloneOperation.php @@ -14,6 +14,7 @@ trait CloneOperation public function clone($id) { $this->crud->hasAccessOrFail('clone'); + $this->crud->setOperation('clone'); $clonedEntry = $this->crud->model->findOrFail($id)->replicate(); @@ -30,6 +31,7 @@ public function clone($id) public function bulkClone() { $this->crud->hasAccessOrFail('clone'); + $this->crud->setOperation('clone'); $entries = $this->request->input('entries'); $clonedEntries = []; diff --git a/src/app/Http/Controllers/Operations/Create.php b/src/app/Http/Controllers/Operations/CreateOperation.php similarity index 94% rename from src/app/Http/Controllers/Operations/Create.php rename to src/app/Http/Controllers/Operations/CreateOperation.php index 3819fbb459..06a7556e50 100644 --- a/src/app/Http/Controllers/Operations/Create.php +++ b/src/app/Http/Controllers/Operations/CreateOperation.php @@ -4,7 +4,7 @@ use Illuminate\Http\Request as StoreRequest; -trait Create +trait CreateOperation { /** * Show the form for creating inserting a new row. @@ -14,7 +14,7 @@ trait Create public function create() { $this->crud->hasAccessOrFail('create'); - $this->crud->setOperation('Create'); + $this->crud->setOperation('create'); // prepare the fields you need to show $this->data['crud'] = $this->crud; @@ -36,7 +36,7 @@ public function create() public function storeCrud(StoreRequest $request = null) { $this->crud->hasAccessOrFail('create'); - $this->crud->setOperation('Create'); + $this->crud->setOperation('create'); // fallback to global request instance if (is_null($request)) { diff --git a/src/app/Http/Controllers/Operations/Delete.php b/src/app/Http/Controllers/Operations/DeleteOperation.php similarity index 89% rename from src/app/Http/Controllers/Operations/Delete.php rename to src/app/Http/Controllers/Operations/DeleteOperation.php index 39d8014d4e..8c1b14d7d8 100644 --- a/src/app/Http/Controllers/Operations/Delete.php +++ b/src/app/Http/Controllers/Operations/DeleteOperation.php @@ -2,7 +2,7 @@ namespace Backpack\CRUD\app\Http\Controllers\Operations; -trait Delete +trait DeleteOperation { /** * Remove the specified resource from storage. @@ -14,7 +14,7 @@ trait Delete public function destroy($id) { $this->crud->hasAccessOrFail('delete'); - $this->crud->setOperation('Delete'); + $this->crud->setOperation('delete'); // get entry ID from Request (makes sure its the last ID for nested resources) $id = $this->crud->getCurrentEntryId() ?? $id; @@ -30,7 +30,7 @@ public function destroy($id) public function bulkDelete() { $this->crud->hasAccessOrFail('delete'); - $this->crud->setOperation('Delete'); + $this->crud->setOperation('delete'); $entries = $this->request->input('entries'); $deletedEntries = []; diff --git a/src/app/Http/Controllers/Operations/ListEntries.php b/src/app/Http/Controllers/Operations/ListOperation.php similarity index 95% rename from src/app/Http/Controllers/Operations/ListEntries.php rename to src/app/Http/Controllers/Operations/ListOperation.php index bbbbf65b2d..348a55a1bc 100644 --- a/src/app/Http/Controllers/Operations/ListEntries.php +++ b/src/app/Http/Controllers/Operations/ListOperation.php @@ -2,7 +2,7 @@ namespace Backpack\CRUD\app\Http\Controllers\Operations; -trait ListEntries +trait ListOperation { /** * Display all rows in the database for this entity. @@ -12,7 +12,7 @@ trait ListEntries public function index() { $this->crud->hasAccessOrFail('list'); - $this->crud->setOperation('ListEntries'); + $this->crud->setOperation('list'); $this->data['crud'] = $this->crud; $this->data['title'] = $this->crud->getTitle() ?? mb_ucfirst($this->crud->entity_name_plural); @@ -29,7 +29,7 @@ public function index() public function search() { $this->crud->hasAccessOrFail('list'); - $this->crud->setOperation('ListEntries'); + $this->crud->setOperation('list'); $totalRows = $filteredRows = $this->crud->count(); $startIndex = $this->request->input('start') ?: 0; @@ -84,7 +84,7 @@ public function search() public function showDetailsRow($id) { $this->crud->hasAccessOrFail('details_row'); - $this->crud->setOperation('ListEntries'); + $this->crud->setOperation('list'); // get entry ID from Request (makes sure its the last ID for nested resources) $id = $this->crud->getCurrentEntryId() ?? $id; diff --git a/src/app/Http/Controllers/Operations/Reorder.php b/src/app/Http/Controllers/Operations/ReorderOperation.php similarity index 92% rename from src/app/Http/Controllers/Operations/Reorder.php rename to src/app/Http/Controllers/Operations/ReorderOperation.php index 78ad1a1779..c774135c64 100644 --- a/src/app/Http/Controllers/Operations/Reorder.php +++ b/src/app/Http/Controllers/Operations/ReorderOperation.php @@ -2,7 +2,7 @@ namespace Backpack\CRUD\app\Http\Controllers\Operations; -trait Reorder +trait ReorderOperation { /** * Reorder the items in the database using the Nested Set pattern. @@ -14,7 +14,7 @@ trait Reorder public function reorder() { $this->crud->hasAccessOrFail('reorder'); - $this->crud->setOperation('Reorder'); + $this->crud->setOperation('reorder'); if (! $this->crud->isReorderEnabled()) { abort(403, 'Reorder is disabled.'); @@ -39,7 +39,7 @@ public function reorder() public function saveReorder() { $this->crud->hasAccessOrFail('reorder'); - $this->crud->setOperation('Reorder'); + $this->crud->setOperation('reorder'); $all_entries = \Request::input('tree'); diff --git a/src/app/Http/Controllers/Operations/Revisions.php b/src/app/Http/Controllers/Operations/RevisionsOperation.php similarity index 94% rename from src/app/Http/Controllers/Operations/Revisions.php rename to src/app/Http/Controllers/Operations/RevisionsOperation.php index 48483f0057..7571e88c0d 100644 --- a/src/app/Http/Controllers/Operations/Revisions.php +++ b/src/app/Http/Controllers/Operations/RevisionsOperation.php @@ -2,7 +2,7 @@ namespace Backpack\CRUD\app\Http\Controllers\Operations; -trait Revisions +trait RevisionsOperation { /** * Display the revisions for specified resource. @@ -14,7 +14,7 @@ trait Revisions public function listRevisions($id) { $this->crud->hasAccessOrFail('revisions'); - $this->crud->setOperation('Revisions'); + $this->crud->setOperation('revisions'); // get entry ID from Request (makes sure its the last ID for nested resources) $id = $this->crud->getCurrentEntryId() ?? $id; @@ -43,7 +43,7 @@ public function listRevisions($id) public function restoreRevision($id) { $this->crud->hasAccessOrFail('revisions'); - $this->crud->setOperation('Revisions'); + $this->crud->setOperation('revisions'); $revisionId = \Request::input('revision_id', false); if (! $revisionId) { diff --git a/src/app/Http/Controllers/Operations/Show.php b/src/app/Http/Controllers/Operations/ShowOperation.php similarity index 96% rename from src/app/Http/Controllers/Operations/Show.php rename to src/app/Http/Controllers/Operations/ShowOperation.php index fda8d28cfe..00afafcad2 100644 --- a/src/app/Http/Controllers/Operations/Show.php +++ b/src/app/Http/Controllers/Operations/ShowOperation.php @@ -2,7 +2,7 @@ namespace Backpack\CRUD\app\Http\Controllers\Operations; -trait Show +trait ShowOperation { /** * Display the specified resource. @@ -14,7 +14,7 @@ trait Show public function show($id) { $this->crud->hasAccessOrFail('show'); - $this->crud->setOperation('Show'); + $this->crud->setOperation('show'); // get entry ID from Request (makes sure its the last ID for nested resources) $id = $this->crud->getCurrentEntryId() ?? $id; diff --git a/src/app/Http/Controllers/Operations/Update.php b/src/app/Http/Controllers/Operations/UpdateOperation.php similarity index 94% rename from src/app/Http/Controllers/Operations/Update.php rename to src/app/Http/Controllers/Operations/UpdateOperation.php index 759e8b9512..fc42487b5b 100644 --- a/src/app/Http/Controllers/Operations/Update.php +++ b/src/app/Http/Controllers/Operations/UpdateOperation.php @@ -4,7 +4,7 @@ use Illuminate\Http\Request as UpdateRequest; -trait Update +trait UpdateOperation { /** * Show the form for editing the specified resource. @@ -16,7 +16,7 @@ trait Update public function edit($id) { $this->crud->hasAccessOrFail('update'); - $this->crud->setOperation('Update'); + $this->crud->setOperation('update'); // get entry ID from Request (makes sure its the last ID for nested resources) $id = $this->crud->getCurrentEntryId() ?? $id; @@ -44,7 +44,7 @@ public function edit($id) public function updateCrud(UpdateRequest $request = null) { $this->crud->hasAccessOrFail('update'); - $this->crud->setOperation('Update'); + $this->crud->setOperation('update'); // fallback to global request instance if (is_null($request)) { From 81427009535dcf638b31ed61e47ad936a459d8f6 Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Thu, 22 Nov 2018 19:20:27 +0200 Subject: [PATCH 123/124] Apply fixes from StyleCI (#1720) [ci skip] [skip ci] --- src/app/Http/Controllers/CrudController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/Http/Controllers/CrudController.php b/src/app/Http/Controllers/CrudController.php index 5dac448686..3200deb491 100644 --- a/src/app/Http/Controllers/CrudController.php +++ b/src/app/Http/Controllers/CrudController.php @@ -6,16 +6,16 @@ use Illuminate\Http\Request; use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Routing\Controller as BaseController; -use Backpack\CRUD\app\Http\Controllers\Operations\ShowOperation; use Illuminate\Foundation\Validation\ValidatesRequests; +use Backpack\CRUD\app\Http\Controllers\Operations\SaveActions; +use Backpack\CRUD\app\Http\Controllers\Operations\ListOperation; +use Backpack\CRUD\app\Http\Controllers\Operations\ShowOperation; +use Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation; use Backpack\CRUD\app\Http\Controllers\Operations\CreateOperation; use Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation; use Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation; use Backpack\CRUD\app\Http\Controllers\Operations\ReorderOperation; use Backpack\CRUD\app\Http\Controllers\Operations\RevisionsOperation; -use Backpack\CRUD\app\Http\Controllers\Operations\ListOperation; -use Backpack\CRUD\app\Http\Controllers\Operations\SaveActions; -use Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation; class CrudController extends BaseController { From cb81b3c829c76d915cffde02b4e14b15553a369b Mon Sep 17 00:00:00 2001 From: Cristian Tabacitu Date: Thu, 22 Nov 2018 19:33:29 +0200 Subject: [PATCH 124/124] added settings public property on CrudPanel object to have a place for custom operations to store stuff --- src/CrudPanel.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/CrudPanel.php b/src/CrudPanel.php index 7a0d08719e..a868087926 100644 --- a/src/CrudPanel.php +++ b/src/CrudPanel.php @@ -49,6 +49,16 @@ class CrudPanel public $entity_name = 'entry'; // what name will show up on the buttons, in singural (ex: Add entity) public $entity_name_plural = 'entries'; // what name will show up on the buttons, in plural (ex: Delete 5 entities) public $request; + public $settings = [ + 'create' => [], + 'update' => [], + 'list' => [], + 'delete' => [], + 'clone' => [], + 'reorder' => [], + 'revisions' => [], + 'show' => [], + ]; public $access = ['list', 'create', 'update', 'delete'/* 'revisions', reorder', 'show', 'details_row' */];