Merge pull request symfony2admingenerator#241 from Hakadel/master

Add a required attribute for the "double_list" type in the template and fix a JS condition
vbardales · Oct 10, 2012 · 3487377 · 3487377
2 parents 2ec5b45 + 5e02951
commit 3487377
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Resources/public/javascripts/double_list.js b/Resources/public/javascripts/double_list.js
@@ -4,7 +4,7 @@ var sfDoubleList =
   {
     form = sfDoubleList.get_current_form(id);
 
-    callback = function() { sfDoubleList.submit(form, className) };
+    callback = function() { sfDoubleList.submit(form, className); };
 
     if (form.addEventListener)
     {
@@ -34,13 +34,15 @@ var sfDoubleList =
   submit: function(form, className)
   {
     var element;
+    var selectedClassName;
 
     for (var i = 0; i < form.elements.length; i++)
     {
       element = form.elements[i];
       if (element.type == 'select-multiple')
       {
-        if (element.className == className + '-selected')
+        selectedClassName = className + '-selected';
+        if (element.className.match(new RegExp(selectedClassName, 'gi')))
         {
           for (var j = 0; j < element.options.length; j++)
           {

diff --git a/Resources/views/Form/fields.html.twig b/Resources/views/Form/fields.html.twig
@@ -22,7 +22,7 @@
     </div>
     <div style="float: left">
          <div class="double_list_label">{% trans from "Admingenerator" %}double_list.selected{% endtrans %}</div>
-         <select name="{{ form.getParent().get('id') }}[{{ form.get("name") }}][]" multiple="true" id="{{ form.get("id") }}_selected" class="double_list_select-selected">
+         <select name="{{ form.getParent().get('id') }}[{{ form.get("name") }}][]" multiple="true" id="{{ form.get("id") }}_selected" {% if (form.vars.required) %}required="required" {% endif %}class="double_list_select-selected">
          {% for choice in choices %}
             {% if choice is selectedchoice(value) %}
                 <option value="{{ choice.value }}">{{ choice.label }}</option>