Merge branch 'master' into develop
This commit is contained in:
commit
f3674ad4e0
|
@ -20,6 +20,8 @@ class CollectionType extends BaseCollectionType
|
||||||
'collection_name' => $options['collection_name'],
|
'collection_name' => $options['collection_name'],
|
||||||
'label_add' => $options['label_add'],
|
'label_add' => $options['label_add'],
|
||||||
'label_delete' => $options['label_delete'],
|
'label_delete' => $options['label_delete'],
|
||||||
|
'allow_add' => $options['allow_add'],
|
||||||
|
'allow_delete' => $options['allow_delete'],
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -58,6 +58,7 @@
|
||||||
{{ form_row(child) }}
|
{{ form_row(child) }}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
|
{% if allow_delete %}
|
||||||
<div class="text-right">
|
<div class="text-right">
|
||||||
<span data-collection-delete-container class="btn btn-sm btn-danger">
|
<span data-collection-delete-container class="btn btn-sm btn-danger">
|
||||||
<span data-collection-delete="{{ loop.index }}">
|
<span data-collection-delete="{{ loop.index }}">
|
||||||
|
@ -66,10 +67,12 @@
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{% if allow_add %}
|
||||||
<div data-collection-add="collection-{{ collection_name }}" class="collection-add">
|
<div data-collection-add="collection-{{ collection_name }}" class="collection-add">
|
||||||
<span class="btn btn-sm btn-primary" data-collection-add="collection-{{ collection_name }}">
|
<span class="btn btn-sm btn-primary" data-collection-add="collection-{{ collection_name }}">
|
||||||
<span data-collection-add="collection-{{ collection_name }}" class="fa fa-plus"></span>
|
<span data-collection-add="collection-{{ collection_name }}" class="fa fa-plus"></span>
|
||||||
|
@ -81,13 +84,16 @@
|
||||||
<div data-collection-item="__name__">
|
<div data-collection-item="__name__">
|
||||||
{{ form_rest(form.value.vars.prototype) }}
|
{{ form_rest(form.value.vars.prototype) }}
|
||||||
|
|
||||||
|
{% if allow_delete %}
|
||||||
<div class="text-right">
|
<div class="text-right">
|
||||||
<span data-collection-delete-container class="btn btn-sm btn-danger">
|
<span data-collection-delete-container class="btn btn-sm btn-danger">
|
||||||
{{ label_delete|trans }}
|
{{ label_delete|trans }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block murph_collection_widget %}
|
{% block murph_collection_widget %}
|
||||||
|
@ -100,6 +106,7 @@
|
||||||
{{ form_row(child) }}
|
{{ form_row(child) }}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
|
{% if allow_delete %}
|
||||||
<div class="text-right">
|
<div class="text-right">
|
||||||
<span data-collection-delete-container class="btn btn-sm btn-danger">
|
<span data-collection-delete-container class="btn btn-sm btn-danger">
|
||||||
<span data-collection-delete="{{ loop.index }}">
|
<span data-collection-delete="{{ loop.index }}">
|
||||||
|
@ -108,10 +115,12 @@
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{% if allow_add %}
|
||||||
<div data-collection-add="collection-{{ collection_name }}" class="collection-add">
|
<div data-collection-add="collection-{{ collection_name }}" class="collection-add">
|
||||||
<span class="btn btn-sm btn-primary" data-collection-add="collection-{{ collection_name }}">
|
<span class="btn btn-sm btn-primary" data-collection-add="collection-{{ collection_name }}">
|
||||||
<span data-collection-add="collection-{{ collection_name }}" class="fa fa-plus"></span>
|
<span data-collection-add="collection-{{ collection_name }}" class="fa fa-plus"></span>
|
||||||
|
@ -123,13 +132,16 @@
|
||||||
<div data-collection-item="__name__" {% for attr, value in attrs %}{{ attr }}="{{ value }}"{% endfor %}>
|
<div data-collection-item="__name__" {% for attr, value in attrs %}{{ attr }}="{{ value }}"{% endfor %}>
|
||||||
{{ form_rest(form.vars.prototype) }}
|
{{ form_rest(form.vars.prototype) }}
|
||||||
|
|
||||||
|
{% if allow_delete %}
|
||||||
<div class="text-right">
|
<div class="text-right">
|
||||||
<span data-collection-delete-container class="btn btn-sm btn-danger">
|
<span data-collection-delete-container class="btn btn-sm btn-danger">
|
||||||
{{ label_delete|trans }}
|
{{ label_delete|trans }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block file_picker_widget %}
|
{% block file_picker_widget %}
|
||||||
|
|
Loading…
Reference in a new issue