Correct saving in modals

Author: wilr

client/js/ManyField.src.js

@@ -133,7 +133,7 @@
     $('body').on('click', '.manyfield__save', function(e) {
       var form = $(this).parents('.modal-content').find('form');
 
-      if (form.checkValidity()) {
+      if (form.get(0).checkValidity()) {
         var body = $(this).parents('.modal-content').find('.modal-body')
           .addClass('loading')
 
@@ -144,6 +144,8 @@
         })
       } else {
         e.preventDefault();
+
+        return false;
       }
     })
 
@@ -157,9 +159,10 @@
       // find the add modal, set the content to that and open it.
       var id = parents.attr('id');
       var modal = $('#' + id + '_modal');
+      var saveURL = modal.attr('data-save-url');
 
       $.get(modal.data('form-url'), {RecordID: recordId}, function(data) {
-        modal.find('.modal-body').html(data).removeClass('loading');
+        modal.find('.modal-body').html($('<form action="'+ saveURL + '"></form>').html(data)).removeClass('loading');
         modal.modal('show');
       });
     })

src/ManyField.php

@@ -468,7 +468,7 @@ public function AddLink()
     }
 
     /**
-     * Add URL
+     * Edit Record Form URL
      *
      * @return string
      */
@@ -480,6 +480,19 @@ public function EditLink()
         );
     }
 
+    /**
+     * Save Record Form URL
+     *
+     * @return string
+     */
+    public function SaveLink()
+    {
+        return Controller::join_links(
+            $this->AbsoluteLink('saveRecord'),
+            '?SecurityID='. SecurityToken::inst()->getValue() . '&ClassName=' . $this->value->dataClass()
+        );
+    }
+
     /**
      * Override set value.
      */

templates/ManyFieldModal.ss

@@ -21,7 +21,7 @@
 </div>
 <% end_if %>
 
-<div class="modal" id="{$HolderID}_modal" data-form-url="$EditLink">
+<div class="modal" id="{$HolderID}_modal" data-form-url="$EditLink" data-save-url="$SaveLink">
   <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
       <div class="modal-header">
@@ -35,7 +35,7 @@
       </div>
 
       <div class="modal-footer">
-        <button type="button" class="btn btn-primary manyfield__save" data-dismiss="modal">Save</button>
+        <button type="button" class="btn btn-primary manyfield__save">Save</button>
         <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
       </div>
     </div><!-- /.modal-content -->

templates/ManyFieldModal_holder.ss

@@ -21,7 +21,7 @@
 </div>
 <% end_if %>
 
-<div class="modal" id="{$HolderID}_modal" data-form-url="$EditLink">
+<div class="modal" id="{$HolderID}_modal" data-form-url="$EditLink" data-save-url="$SaveLink">
   <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
       <div class="modal-header">
@@ -35,7 +35,7 @@
       </div>
 
       <div class="modal-footer">
-        <button type="button" class="btn btn-primary manyfield__save" data-dismiss="modal">Save</button>
+        <button type="button" class="btn btn-primary manyfield__save">Save</button>
         <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
       </div>
     </div><!-- /.modal-content -->