editor templates validation tweak

Author: yohsii

puckweb/Areas/puck/Views/Shared/EditorTemplates/ContentPicker.cshtml

@@ -100,6 +100,9 @@
         
         var init = function (container) {
             var validationDummy = container.find(".validationDummy");
+            validationDummyCounter++;
+            if (((validationDummy.attr("name")||"").match(/_/g) || []).length < 2)
+                validationDummy.attr("name", validationDummy.attr("name") + "_" + validationDummyCounter);
             validationDummy.attr("data-val-required", "The " + container.parents(".fieldwrapper:first").find(".editor-label label").html() + " field is required.");
             container.find(".validationDummySummary").attr("data-valmsg-for", validationDummy.attr("name"));
 

puckweb/Areas/puck/Views/Shared/EditorTemplates/ImagePicker.cshtml

@@ -110,6 +110,9 @@
         
         var init = function (container) {
             var validationDummy = container.find(".validationDummy");
+            validationDummyCounter++;
+            if (((validationDummy.attr("name")||"").match(/_/g) || []).length < 2)
+                validationDummy.attr("name", validationDummy.attr("name") + "_" + validationDummyCounter);
             validationDummy.attr("data-val-required", "The " + container.parents(".fieldwrapper:first").find(".editor-label label").html() + " field is required.");
             container.find(".validationDummySummary").attr("data-valmsg-for",validationDummy.attr("name"));
 

puckweb/Areas/puck/Views/Shared/EditorTemplates/ListEditor.cshtml

@@ -138,7 +138,14 @@
                     if (window.debug)
                         debugger;
                     var el = $(this);
-                    el.parents(".listeditor:first").find(".validationDummy:last").val("1");
+                    var validationDummy = el.parents(".listeditor:first").find(".validationDummy:last");
+                    if (validationDummy.length > 0) {
+                        validationDummy.val("1");
+                        validationDummyCounter++;
+                        if (((validationDummy.attr("name")||"").match(/_/g) || []).length < 2)
+                            validationDummy.attr("name", validationDummy.attr("name") + "_" + validationDummyCounter);
+                        el.parents(".listeditor:first").find(".validationDummySummary:first").attr("data-valmsg-for",validationDummy.attr("name"));
+                    }
                     var _selected_container = el.parents(".listeditor:first").find(".selected_content:first");
                     var elToCopy = template.find(".listeditor_" + escapePropname(toZeroIndex(getPropName())) + " .itemContainer:first");
                     //console.log("el to copy", elToCopy);
@@ -188,8 +195,7 @@
                     var form = _selected_container.parents("form:first");
                     form.removeData("validator");
                     form.removeData("unobtrusiveValidation");
-                    $.validator.unobtrusive.parse(form);
-
+                    
                     //trigger container update
                     copy.find(".containerTrigger").click();
 
@@ -198,6 +204,9 @@
                         var editorContainer = $(this);
                         editorContainer.trigger("puckListEditorUpdate",[editorContainer]);
                     });
+
+                    $.validator.unobtrusive.parse(form);
+
                 });
 
             });

puckweb/Areas/puck/Views/Shared/EditorTemplates/Tags.cshtml

@@ -69,6 +69,9 @@
         
         var init = function (container) {
             var validationDummy = container.find(".validationDummy");
+            validationDummyCounter++;
+            if (((validationDummy.attr("name")||"").match(/_/g) || []).length < 2)
+                validationDummy.attr("name", validationDummy.attr("name") + "_" + validationDummyCounter);
             validationDummy.attr("data-val-required", "The " + container.parents(".fieldwrapper:first").find(".editor-label label").html() + " field is required.");
             container.find(".validationDummySummary").attr("data-valmsg-for",validationDummy.attr("name"));
 

puckweb/wwwroot/Areas/puck/assets/js/puck.actions.js

@@ -7,6 +7,7 @@ var cright = $(".rightarea .content");
 var cinterfaces = $("body>.main>.interfaces");
 var cmsg = $(".top .message");
 var cidCounter = 0;
+var validationDummyCounter = 0;
 var searchType = '';
 var searchRoot = '';
 var searchTerm = '';
@@ -687,8 +688,8 @@ var wireForm = function (form, success, fail,submit) {
             }
         } else {
 
-            if (cright.find(".editorContainer:hidden .input-validation-error").length > 0) {
-                var editorContainers = cright.find(".editorContainer:hidden .input-validation-error").parents(".editorContainer:first");
+            if (form.find(".editorContainer:hidden .input-validation-error").length > 0) {
+                var editorContainers = form.find(".editorContainer:hidden .input-validation-error").parents(".editorContainer");
                 editorContainers.each(function (i) {
                     var editorContainer = $(this);
                     editorContainer.show();
@@ -698,8 +699,8 @@ var wireForm = function (form, success, fail,submit) {
                 });
             }
 
-            var err_el = cright.find(".input-validation-error:first");
-            cright.find("[href='#" + err_el.parents(".tab-pane").attr("id") + "']").click();
+            var err_el = form.find(".input-validation-error:first");
+            form.find("[href='#" + err_el.parents(".tab-pane").attr("id") + "']").click();
             if (err_el.is(":visible")) {
                 err_el.focus();
             } else {