Browse Source

Merge branch 'master' into develop

master
Fabien Normand 3 years ago
parent
commit
52c67682f4
3 changed files with 2 additions and 6 deletions
  1. +1
    -1
      Field/FileManagerField.php
  2. +1
    -0
      Resources/assets/functions/widgets.js
  3. +0
    -5
      Resources/views/adminlte/crud/form_theme.html.twig

+ 1
- 1
Field/FileManagerField.php View File

->setProperty($propertyName) ->setProperty($propertyName)
->setLabel($label) ->setLabel($label)
->setTemplatePath('@LcSov/adminlte/crud/field/file.html.twig') ->setTemplatePath('@LcSov/adminlte/crud/field/file.html.twig')
/*->addWebpackEncoreEntries('adminlte-field-filemanager')*/
//->addWebpackEncoreEntries('adminlte-field-filemanager')
->setCustomOption('managerDir', 'file') ->setCustomOption('managerDir', 'file')
->setCustomOption('type', 'file') ->setCustomOption('type', 'file')
->setFormType(FileManagerType::class) ->setFormType(FileManagerType::class)

+ 1
- 0
Resources/assets/functions/widgets.js View File

var event = new Event('change'); var event = new Event('change');
e.target.dispatchEvent(event); e.target.dispatchEvent(event);
}); });
SovTools.log(myselect);


return myselect; return myselect;
} }

+ 0
- 5
Resources/views/adminlte/crud/form_theme.html.twig View File

{% use '@EasyAdmin/crud/form_theme.html.twig' %} {% use '@EasyAdmin/crud/form_theme.html.twig' %}


{% block form_start %} {% block form_start %}

{% if form.vars.errors|length > 0 and 'ea_crud' in form.vars.block_prefixes|default([]) %} {% if form.vars.errors|length > 0 and 'ea_crud' in form.vars.block_prefixes|default([]) %}
{{ form_errors(form) }} {{ form_errors(form) }}
{% endif %} {% endif %}
{%- endif -%} {%- endif -%}
{%- endif -%} {%- endif -%}



{% set entityNameOrObject = form.parent.vars.data %} {% set entityNameOrObject = form.parent.vars.data %}


{% if form.parent.vars.translation_entity_name is defined %} {% if form.parent.vars.translation_entity_name is defined %}
{% endif %} {% endif %}
#} #}


{% if translation_domain == null %}
{% set translation_domain = 'admin' %}
{% endif %}
<{{ element|default('label') }}{% if label_attr %}{% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}{% endif %} <{{ element|default('label') }}{% if label_attr %}{% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}{% endif %}
>{{ (label is not empty and '.' in label) ? label|trans({}, translation_domain) : name|sov_trans_admin_field(entityNameOrObject) }} >{{ (label is not empty and '.' in label) ? label|trans({}, translation_domain) : name|sov_trans_admin_field(entityNameOrObject) }}
</{{ element|default('label') }}> </{{ element|default('label') }}>

Loading…
Cancel
Save