From 45a3131caadd7ba41a837c02ace74687c92c14c1 Mon Sep 17 00:00:00 2001 From: mikeyc7m Date: Tue, 30 Jun 2015 15:10:20 +1000 Subject: [PATCH] bugfix + enhancement to support modeladmin Update to allow UserDefinedForm pages to be managed through ModelAdmin. * Needed to update the ID of the form. * Bug on the form data serialisation (missing ampersand breaks security token.) --- javascript/UserForm.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/javascript/UserForm.js b/javascript/UserForm.js index e01d725..ef662d3 100644 --- a/javascript/UserForm.js +++ b/javascript/UserForm.js @@ -116,10 +116,12 @@ */ $('div.FieldEditor .MenuHolder .action').entwine({ onclick: function(e) { - var form = $("#Form_EditForm"), + var theform = $("#Form_EditForm"); // edit from page + if ( theform.length < 1 ) theform = $("#Form_ItemEditForm"); // edit from modeladmin + var form = theform, length = $(".FieldInfo").length + 1, fieldType = $(this).siblings("select").val(), - formData = form.serialize()+'NewID='+ length +"&Type="+ fieldType, + formData = form.serialize()+'&NewID='+ length +"&Type="+ fieldType, fieldEditor = $(this).closest('.FieldEditor'); e.preventDefault(); @@ -348,4 +350,4 @@ }); }); }); -})(jQuery); \ No newline at end of file +})(jQuery);