[Admin] Fixed bug with editing checkbox attributes

pamil · Jun 20, 2016 · de17f28 · de17f28
1 parent 38355f9
commit de17f28
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/Resources/views/Product/Attribute/attributeValues.html.twig b/Resources/views/Product/Attribute/attributeValues.html.twig
@@ -3,9 +3,9 @@
 <div class="attribute" data-id="{{ attributeId }}">
     {% set id = form.vars.label|replace(' ', '_')|lower %}
     {% if 'type_checkbox' in form.vars.cache_key %}
-        {{ _self.checkboxField(form, count, id, subject, metadata) }}
+        {{ _self.checkboxField(form, count, id, subject, metadata.applicationName) }}
     {% else %}
-        {{ _self.textField(form, count, id, subject, metadata) }}
+        {{ _self.textField(form, count, id, subject, metadata.applicationName) }}
     {% endif %}
     <input type="hidden"
            name="{{ metadata.applicationName }}_{{ subject }}[attributes][{{ count }}][attribute]"
@@ -29,19 +29,19 @@
     {% endif %}
 {% endmacro %}
 
-{% macro textField(form, count, id, subject, metadata) %}
+{% macro textField(form, count, id, subject, applicationName) %}
     <div class="ui right fluid labeled input" style="margin-top: 15px; margin-bottom: 15px;">
         <div class="ui label">{{ form.vars.label }}</div>
-        {{ _self.formField(form, count, id, '', subject, metadata.applicationName) }}
+        {{ _self.formField(form, count, id, '', subject, applicationName) }}
         <button class="ui red right labeled icon button">
             <i class="remove icon"></i> {{ 'sylius.ui.delete'|trans }}
         </button>
     </div>
 {% endmacro %}
 
-{% macro checkboxField(form, count, id, subject, metadata) %}
+{% macro checkboxField(form, count, id, subject, applicationName) %}
     <div class="ui toggle checkbox" style="margin-top: 15px; margin-bottom: 15px;">
-        {{ _self.formField(form, count, id, '', subject, metadata.applicationName) }}
+        {{ _self.formField(form, count, id, '', subject, applicationName) }}
         <label>{{ form.vars.label }}</label>
     </div>
     <button class="ui red right labeled icon button" style="float: right;">

diff --git a/Resources/views/Product/Attribute/attributesCollection.html.twig b/Resources/views/Product/Attribute/attributesCollection.html.twig
@@ -3,7 +3,6 @@
 {% from '@SyliusAdmin/Product/Attribute/attributeValues.html.twig' import checkboxField %}
 {% from '@SyliusAdmin/Product/Attribute/attributeValues.html.twig' import textField %}
 
-
 {% block collection_widget -%}
     {% from 'SyliusResourceBundle:Macros:notification.html.twig' import error %}
     {% set attr = attr|merge({'class': attr.class|default ~ ' controls collection-widget'}) %}
@@ -56,8 +55,8 @@
                 <button class="ui red right labeled icon button">
                     <i class="remove icon"></i> {{ 'sylius.ui.delete'|trans }}
                 </button>
-                {{ form_widget(form.attribute, {'attr': {'style': 'display: none'}}) }}
             </div>
         {% endif %}
+        <input type="hidden" name="{{ form.attribute.vars.full_name }}" id="{{ form.attribute.vars.id }}" value="{{ form.vars.data.attribute.id }}"/>
     </div>
 {% endmacro %}