Skip to content

Crud create query auto fill #576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
flkasper wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Crud create query auto fill #576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
941fa05
Crud create query auto fill
Feb 24, 2021
1a20e02
Remove forgotten debug o_dump
Feb 24, 2021
1860d24
Fix missing parameter in method overriding
Apr 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Engine/Modules/AdminBackend/Plugins/Controller/Backend/PluginController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,8 +591,8 @@ protected function appendTwigFlashDetailMessage(TwigFlash $twigFlash, string $me
}

/** @inheritDoc */
protected function prepareItemDataArray(?AbstractModel $entity, string $crudAction) : array {
$data = parent::prepareItemDataArray($entity, $crudAction);
protected function prepareItemDataArray(?AbstractModel $entity, string $crudAction, array $queryParams = []) : array {
$data = parent::prepareItemDataArray($entity, $crudAction, $queryParams);

// Refactor after Boot-Refactoring
$pluginBootstrapClass = $data['name'] . '\\Bootstrap';
Expand Down
427 changes: 278 additions & 149 deletions Engine/Modules/CRUD/Controller/Backend/BaseCrudController.php
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Engine/Modules/Core/Helper/ArrayHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static function issetNotEmpty(array $array, $key) : bool {
* @return mixed
*/
public static function get(array $array, $key, $defaultValue = null) {
return isset($array[$key]) ? $array[$key] : $defaultValue;
return $array[$key] ?? $defaultValue;
}

/**
Expand Down
4 changes: 2 additions & 2 deletions Engine/Modules/I18n/Controller/Backend/I18n/LanguageController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ class LanguageController extends BaseCrudController {
];

/** @inheritDoc */
protected function prepareItemDataArray(?AbstractModel $entity, string $crudAction) : array {
$data = parent::prepareItemDataArray($entity, $crudAction);
protected function prepareItemDataArray(?AbstractModel $entity, string $crudAction, array $queryParams = []) : array {
$data = parent::prepareItemDataArray($entity, $crudAction, $queryParams);
if (!isset($this->filterSelectData['snippets'])) {
$this->snippets = [];
try {
Expand Down
4 changes: 2 additions & 2 deletions Engine/Modules/UserManagement/Controller/Backend/UserManagementController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,8 @@ protected function convertData(array $data, string $crudAction) : array {
}

/** @inheritDoc */
protected function prepareItemDataArray(?AbstractModel $entity, string $crudAction) : array {
$data = parent::prepareItemDataArray($entity, $crudAction);
protected function prepareItemDataArray(?AbstractModel $entity, string $crudAction, array $queryParams = []) : array {
$data = parent::prepareItemDataArray($entity, $crudAction, $queryParams);

$data['password'] = '';

Expand Down
4 changes: 2 additions & 2 deletions Plugins/Blog/Controller/Backend/CategoryController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,8 @@ protected function modifyPropertyConfig(array $config) {
}

/** @inheritDoc */
protected function prepareItemDataArray(?AbstractModel $entity, string $crudAction) : array {
$data = parent::prepareItemDataArray($entity, $crudAction);
protected function prepareItemDataArray(?AbstractModel $entity, string $crudAction, array $queryParams = []) : array {
$data = parent::prepareItemDataArray($entity, $crudAction, $queryParams);
if (!empty($data) && $crudAction !== 'create') {
if (!isset($this->filterSelectData['postsOfCategory'])) {
try {
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Blog/Controller/Backend/CommentController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ public function __construct() {
}

/** @inheritDoc */
protected function prepareItemDataArray(?AbstractModel $entity, string $crudAction) : array {
protected function prepareItemDataArray(?AbstractModel $entity, string $crudAction, array $queryParams = []) : array {
if (!isset($entity)) {
return [];
}
Expand Down
4 changes: 2 additions & 2 deletions Plugins/Blog/Controller/Backend/PostController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,8 +429,8 @@ protected function modifyPropertyConfig(array $config) {
}

/** @inheritDoc */
protected function prepareItemDataArray(?AbstractModel $entity, string $crudAction) : array {
$data = parent::prepareItemDataArray($entity, $crudAction);
protected function prepareItemDataArray(?AbstractModel $entity, string $crudAction, array $queryParams = []) : array {
$data = parent::prepareItemDataArray($entity, $crudAction, $queryParams);
if (!empty($data) && $crudAction !== 'create') {
if (!isset($this->filterSelectData['commentsPerPost'])) {
try {
Expand Down
4 changes: 2 additions & 2 deletions Plugins/Insertion/Controller/Backend/BackendInsertionSeoContentController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ protected function getSeoTargetUrls() {
*
* @return array
*/
protected function prepareItemDataArray(?AbstractModel $entity, string $crudAction) : array {
$data = parent::prepareItemDataArray($entity, $crudAction);
protected function prepareItemDataArray(?AbstractModel $entity, string $crudAction, array $queryParams = []) : array {
$data = parent::prepareItemDataArray($entity, $crudAction, $queryParams);
if (isset($data['seoTargetUrl']['id'])) {
$data['seoTargetUrl'] = $data['seoTargetUrl']['id'];
}
Expand Down
2 changes: 1 addition & 1 deletion Themes/Base/Backend/CRUD/Components/Editor/Color.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}
} %}
<div class="input-group-addon oforge-color-picker--reset"
data-color="{{ item[crudProperty.name]|default(crudProperty.editor.default)|default('#000') }}">
data-color="{{ item[crudProperty.name]|default('#000') }}">
<i class="fa fa-undo"></i>
</div>
</div>
12 changes: 2 additions & 10 deletions Themes/Base/Backend/CRUD/Components/Editor/Components/SelectOption.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
{% if crudProperty.multiple %}
{% if crud.context == 'create' %}
{% set selected = value in meta.route.query[crudProperty.name]|default(crudProperty.editor.default)|default('') %}
{% else %}
{% set selected = value in item[crudProperty.name]|default('') %}
{% endif %}
{% set selected = value in item[crudProperty.name]|default('') %}
{% else %}
{% if crud.context == 'create' %}
{% set selected = select_compare(meta.route.query[crudProperty.name]|default(crudProperty.editor.default)|default(''), value) %}
{% else %}
{% set selected = select_compare(item[crudProperty.name]|default(''), value) %}
{% endif %}
{% set selected = select_compare(item[crudProperty.name]|default(''), value) %}
{% endif %}
<option {% if selected %}selected{% endif %} value="{{ value }}">
{{ label }}
Expand Down
2 changes: 1 addition & 1 deletion Themes/Base/Backend/CRUD/Components/Editor/DateTime.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="form-group">
{% set crudDateTimePickerType = crudFieldType|default('datetime') %}
{% set crudDateTimePickerValue = item[crudProperty.name]|default(crudProperty.editor.default)|default(null) %}
{% set crudDateTimePickerValue = item[crudProperty.name]|default(null) %}
{% if crudDateTimePickerType == 'data' %}
{% set crudDateTimePickerValue = crudDateTimePickerValue|formatDate %}
{% elseif crudDateTimePickerType == 'datetime' %}
Expand Down
2 changes: 1 addition & 1 deletion Themes/Base/Backend/CRUD/Components/Editor/Html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
{% if crudProperty.editor.required %}required{% endif %}
{% if crudProperty.editor.placeholder %}placeholder="{{ crudProperty.editor.placeholder }}"{% endif %}
{% if crudProperty.editor.maxlength %}maxlength="{{ crudProperty.editor.maxlength }}"{% endif %}
>{{ item[crudProperty.name] }}</textarea>
>{{- item[crudProperty.name]|default('') -}}</textarea>
2 changes: 1 addition & 1 deletion Themes/Base/Backend/CRUD/Components/Editor/Input.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{% endif %}
<input {% if crudFieldID %}id="{{ crudFieldID }}"{% endif %} type="{{ crudFieldEditor.type|default('text') }}"
{% if crudProperty.crud[crud.context] == 'editable' %}name="data[{% if crud.context == 'index' %}{{ item.id }}][{% endif %}{{ crudProperty.name }}]"{% endif %}
value="{{ item[crudProperty.name]|default(crudProperty.editor.default)|default('') }}"
value="{{ item[crudProperty.name]|default('') }}"
class="form-control {{ crudFieldEditor.class|default('') }}"
{% if crudProperty.editor.required %}required{% endif %}
{% if crudProperty.editor.placeholder %}placeholder="{{ crudProperty.editor.placeholder }}"{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion Themes/Base/Backend/CRUD/Components/Editor/Text.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
{% if crudProperty.editor.required %}required{% endif %}
{% if crudProperty.editor.placeholder %}placeholder="{{ crudProperty.editor.placeholder }}"{% endif %}
{% if crudProperty.editor.maxlength %}maxlength="{{ crudProperty.editor.maxlength }}"{% endif %}
>{{ item[crudProperty.name] }}</textarea>
>{{- item[crudProperty.name]|default('') -}}</textarea>
11 changes: 11 additions & 0 deletions Themes/Base/Backend/CRUD/Components/Index/CrudAction/Create.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{% set queryParams = {} %}
{% for property in crud.properties %}
{% if property.editor.queryAutoFill|default(true) and meta.route.query[property.name] is defined %}
{% set queryParams = queryParams|dotSet(property.name, meta.route.query[property.name]) %}
{% endif %}
{% endfor %}
<a href="{{ url(meta.route.name ~ '_create', {}, queryParams) }}"
title="{{ i18n('backend_crud_btn_create', {en: 'create', de: 'erstellen'}) }}"
class="btn btn-primary {% if not crud.actions.create %}disabled{% endif %}">
<i class="fa fa-plus"></i>
</a>
4 changes: 1 addition & 3 deletions Themes/Base/Backend/CRUD/Components/ViewBase.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,5 @@
{% endblock %}

{% block pagecontent %}
<section class="content">
{% include CRUD_path('Components/Form.twig') with { item: crud.item } %}
</section>
{% include CRUD_path('Components/Form.twig') with { item: crud.item } %}
{% endblock %}
101 changes: 46 additions & 55 deletions Themes/Base/Backend/CRUD/Index.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,66 +1,57 @@
{% extends 'Backend/Master/Index.twig' %}

{% block pagecontent %}
<section class="content">
<div class="row">
<div class="col-xs-12">
<div class="box box-primary">
<div class="box-body">
<div class="row">
<div class="col-xs-12">
<div class="box box-primary">
<div class="box-body">
<div class="row">
<div class="col-xs-12">
{% block crud_actions_row %}
<p class="btn-group" role="group">
{% block crud_actions_group_items %}
{% include CRUD_path('Components/Index/CrudAction/Create.twig') %}
{% endblock crud_actions_group_items %}
</p>
{% endblock crud_actions_row %}
</div>
</div>
{% include CRUD_path('Components/Index/FilterBar.twig') %}
{% if crud.hasEditors %}
<form action="{{ url(meta.route.name, {}, meta.route.query|default({})) }}" method="post"
enctype="multipart/form-data">
{% endif %}
{#{% include CRUD_path('Components/Index/PaginationRow.twig') with {#}
{# pagination: crud.pagination,#}
{# queryKeys: crud.queryKeys,#}
{# route: meta.route#}
{#} only %}#}
<div class="row">
<div class="col-xs-12">
{% block crud_actions_row %}
<p class="btn-group" role="group">
{% block crud_actions_group_items %}
<a href="{{ url(meta.route.name ~ '_create') }}"
title="{{ i18n('backend_crud_btn_create', {en: 'create', de: 'erstellen'}) }}"
class="btn btn-primary {% if not crud.actions.create %}disabled{% endif %}">
<i class="fa fa-plus"></i>
</a>
{% endblock crud_actions_group_items %}
</p>
{% endblock crud_actions_row %}
<div class="col-xs-12 table-responsive">
{% include CRUD_path('Components/Index/Table.twig') %}
</div>
</div>
{% include CRUD_path('Components/Index/FilterBar.twig') with {
crud: crud,
meta: meta
} %}
{% include CRUD_path('Components/Index/PaginationRow.twig') with {
pagination: crud.pagination,
queryKeys: crud.queryKeys,
route: meta.route
} only %}
{% if crud.hasEditors %}
<form action="{{ url(meta.route.name, {}, meta.route.query|default({})) }}" method="post"
enctype="multipart/form-data">
{% endif %}
{#{% include CRUD_path('Components/Index/PaginationRow.twig') with {#}
{# pagination: crud.pagination,#}
{# queryKeys: crud.queryKeys,#}
{# route: meta.route#}
{#} only %}#}
<div class="row">
<div class="col-xs-12 table-responsive">
{% include CRUD_path('Components/Index/Table.twig') %}
</div>
</div>
{% include CRUD_path('Components/Index/PaginationRow.twig') with {
pagination: crud.pagination,
queryKeys: crud.queryKeys,
route: meta.route
} only %}
{% if crud.hasEditors %}
<p></p>
<div class="row">
<div class="col-xs-12">
<div class="form-group">
<input type="hidden" name="action" value="update" />
<input type="submit" class="btn btn-primary"
value="{{ i18n('backend_crud_btn_update', {en: 'update', de: 'aktualisieren'}) }}"
title="{{ i18n('backend_crud_btn_update', {en: 'update', de: 'aktualisieren'}) }}">
</div>
<p></p>
<div class="row">
<div class="col-xs-12">
<div class="form-group">
<input type="hidden" name="action" value="update"/>
<input type="submit" class="btn btn-primary"
value="{{ i18n('backend_crud_btn_update', {en: 'update', de: 'aktualisieren'}) }}"
title="{{ i18n('backend_crud_btn_update', {en: 'update', de: 'aktualisieren'}) }}">
</div>
</div>
</form>
{% endif %}
</div>{# /.box-body #}
</div>{# /.box #}
</div>
</div>
</form>
{% endif %}
</div>{# /.box-body #}
</div>{# /.box #}
</div>
</section>
</div>
{% endblock pagecontent %}