From 9bd7ca9d6cb8bce983cbfd9ab01e4098f20831e0 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Thu, 16 Mar 2017 17:02:28 +0100
Subject: [PATCH] some bugfixes

---
 src/zutil/ui/configurator.dynamic.tmpl | 28 ++++++++++++++------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/zutil/ui/configurator.dynamic.tmpl b/src/zutil/ui/configurator.dynamic.tmpl
index bd6d799..ba75877 100755
--- a/src/zutil/ui/configurator.dynamic.tmpl
+++ b/src/zutil/ui/configurator.dynamic.tmpl
@@ -1,41 +1,43 @@
 <script>
     $(function(){
-        initDynamicModalForm("action");
+        initDynamicModalForm("actionModal", "action-data-conf", "data-conf-template");
     });
 
 
     var dynamicConf = {};
 
-    function initDynamicModalForm(name){
+    function initDynamicModalForm(modalId, formTemplateId, templateID){
         // read in all configurations into global variable (to skip naming issues)
-        dynamicConf[name] = [];
-        $("#"+name+"-data-conf-template div").each(function(){
-            dynamicConf[name][$(this).attr("id")] = $(this).html();
+        dynamicConf[formTemplateId] = [];
+        $("#"+templateID+" div").each(function(){
+            dynamicConf[formTemplateId][$(this).attr("id")] = $(this).html();
         });
         // Update dynamic inputs
-        $("#"+name+"Modal select[name=type]").change(function(){
-            $("#"+name+"Modal #"+name+"-data-conf").html(dynamicConf[name][$(this).val()]);
+        $("#"+modalId+" select[name=type]").change(function(){
+            $("#"+modalId+" #"+formTemplateId).html(dynamicConf[formTemplateId][$(this).val()]);
         });
         // click event
-        $("#"+name+"Modal").on('show.bs.modal', function (event) {
+        $("#"+modalId).on('show.bs.modal', function (event) {
             var button = $(event.relatedTarget);
             var modal = $(this);
-            modal.find("input").val(""); // Reset all inputs
+            // Reset all inputs
+            modal.find("#"+formTemplateId).empty(); // clear form div
 
+            // select dynamic form
+            var selector = modal.find("select[name=type]");
+            selector.val(button.data("type"));
+            selector.change(); // Update dynamic inputs
             // set dynamic form data
-            modal.find("select[name=type]").val(button.data("type"));
-            modal.find("select[name=type]").change(); // Update dynamic inputs
             $.each(button.attr(), function(fieldName, value) {
                 if(fieldName.startsWith("data-")) {
                     fieldName = fieldName.substring(5);
-                    console.log(fieldName, value);
                     // case insensitive search
                     input = modal.find("input").filter(function() {
                            return this.name.toLowerCase() == fieldName;
                     });
                     if (input.attr("type") == "checkbox") { // special handling for checkboxes
                         if (value=="true") input.attr("checked", "true");
-                        else               input.removeAttr("checked", "true");
+                        else               input.removeAttr("checked");
                         // Add default false value as a unchecked checkbox is not included in the post
                         input.parent().prepend("<input type='hidden' name='"+input.attr("name")+"' value='false' />");
                     } else {