Tweaks for saving in a modal

Author: wilr

client/js/ManyField.src.js

@@ -82,11 +82,21 @@
           var id = parents.attr('id');
           var modal = $("#" + id + '_modal');
 
-          modal.find('.modal-body').html($(data)
-            .find('.CompositeField')
-            .removeClass('manyfield__row').html()
-          );
+          // write the provided names as we don't need to namespace them in this
+          // case - we can only edit one at a time
+          var content = $(data)
+          content.find('input[name]').each(function(i, field) {
+            if ($(field).indexOf('[') !== false) {
+              var name = $(field).attr('name').substr(
+                $(field).attr('name').indexOf('[') + 1,
+                $(field).attr('name').indexOf(']')
+              );
+
+              $(field).attr('name', name);
+            }
+          });
 
+          modal.find('.modal-body').html(content.html());
           modal.modal('show');
         } else {
           if (rows && rows.length) {
@@ -143,6 +153,7 @@
           body.html('');
         })
       } else {
+        // highlight issues
         e.preventDefault();
 
         return false;
@@ -162,8 +173,22 @@
       var saveURL = modal.attr('data-save-url');
 
       $.get(modal.data('form-url'), {RecordID: recordId}, function(data) {
-        modal.find('.modal-body').html($('<form action="'+ saveURL + '"></form>').html(data)).removeClass('loading');
-        modal.modal('show');
+          // write the provided names as we don't need to namespace them in this
+          // case - we can only edit one at a time
+          var content = $('<form action="'+ saveURL + '"></form>').html(data)
+          content.find('input[name]').each(function(i, field) {
+            if ($(field).indexOf('[') !== false) {
+              var name = $(field).attr('name').substr(
+                $(field).attr('name').indexOf('[') + 1,
+                $(field).attr('name').indexOf(']')
+              );
+
+              $(field).attr('name', name);
+            }
+          });
+
+          modal.find('.modal-body').html(content).removeClass('loading');
+          modal.modal('show');
       });
     })
 

src/ManyField.php

@@ -499,7 +499,11 @@ public function SaveLink()
     public function setValue($value, $data = null)
     {
         if (!$value && $data) {
-            if ($data->hasMethod($this->name)) {
+            if (is_array($data)) {
+                if (isset($data[$this->name])) {
+                    $value = $data[$this->name];
+                }
+            } else if ($data->hasMethod($this->name)) {
                 $value = $data->{$this->name}();
             }
         }

templates/ManyFieldModal.ss

@@ -36,7 +36,7 @@
 
       <div class="modal-footer">
         <button type="button" class="btn btn-primary manyfield__save">Save</button>
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
       </div>
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->

templates/ManyFieldModal_holder.ss

@@ -36,7 +36,7 @@
 
       <div class="modal-footer">
         <button type="button" class="btn btn-primary manyfield__save">Save</button>
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
       </div>
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->