Merge c4f0f2e into 3708d3f

praekeltfoundation · Nov 10, 2017 · a3460b8 · a3460b8
2 parents 3708d3f + c4f0f2e
commit a3460b8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/molo/surveys/blocks.py b/molo/surveys/blocks.py
@@ -175,3 +175,4 @@ class LogicBlock(blocks.StructBlock):
 
     class Meta:
         icon = 'cogs'
+        label = 'Nested Logic'
diff --git a/molo/surveys/static/js/survey-admin.js b/molo/surveys/static/js/survey-admin.js
@@ -245,6 +245,18 @@ $(function(){
       });
       $("#id_surveys_combinationrule_related-ADD").toggle();
     });
+
+    if($("#id_surveys_combinationrule_related-FORMS").children("li").length > 0){
+      $("#id_surveys_combinationrule_related-ADD").toggle();
+
+      var deleteButton = $("#id_surveys_combinationrule_related-FORMS")
+        .children("li")
+        .find('button[title^="Delete"]')
+
+      deleteButton.click(function () {
+          $("#id_surveys_combinationrule_related-ADD").toggle();
+      });
+    }
   }
   addHideToRuleCombinationFunctionality();