Changeset 9215

Timestamp:

03/14/10 22:09:56 (2 years ago)

Author:

p_lindheimer

Message:

add validation for dialpartterns and make sure at least one entry re #4110

Files:

• modules/branches/2.8/core/page.routing.php (modified) (5 diffs)

modules/branches/2.8/core/page.routing.php

@@ -679 +679 @@
-    changedClass: "text-red"
-  });
-  /*TODO: call clearPattern() here, or move this to routeEdit_onsubmit()?
-  */
-  $("form").submit(function() {
-    $(this).find(".dpt-title").each(function() {
-      if($(this).val() == $(this).data("defText")) {
-        $(this).val("");
-      }
-    });
-  });
-}); 
-
@@ -763 +754 @@
-  var msgInvalidRouteName = "<?php echo _('Route name is invalid, please try again'); ?>";
-  var msgInvalidRoutePwd = "<?php echo _('Route password must be numeric or leave blank to disable'); ?>";
-  var msgInvalidDialPattern = "<?php echo _('Dial pattern is invalid'); ?>";
-  var msgInvalidTrunkSelection = "<?php echo _('At least one trunk must be picked'); ?>";
-  var msgInvalidOutboundCID = "<?php echo _('Invalid Outbound Caller ID'); ?>";
@@ -790 +780 @@
-  
-  theForm.action.value = act;
-
+
+
+
-}
-
@@ -799 +791 @@
-    }
-  });
+  return true;
+}
+
+function validatePatterns() {
+  var one_good = false;
+  var culprit;
+  var msgInvalidDialPattern;
+  defaultEmptyOK = false;
+
+  $(".toggleval").each(function() {
+    if ($.trim($(this).val()) == '') {
+    } else if (!isDialpattern($(this).val())) {
+      culprit = this;
+      return false;
+    } else {
+      one_good = true;
+    }
+  });
+
+  if (culprit == undefined && !one_good) {
+    culprit = $('.toggleval:visible').get(0);
+    msgInvalidDialPattern = "<?php echo _('No dial pattern, there must be at least one'); ?>";
+  } else {
+    msgInvalidDialPattern = "<?php echo _('Dial pattern is invalid'); ?>";
+  }
+  if (culprit != undefined) {
+    // now we have to put it back...
+    // do I have to turn it off first though?
+    $(".dpt-title").each(function() {
+      if ($.trim($(this).val()) == '') {
+        $(this).toggleVal({
+          populateFrom: "title",
+          changedClass: "text-normal",
+          focusClass: "text-normal"
+        });
+      }
+    });
+    return warnInvalid(culprit, msgInvalidDialPattern);
+  } else {
+    return true;
+  }
-}
-
@@ -829 +862 @@
-    document.getElementById('reporoutekey').value=key;
-    document.getElementById('action').value='prioritizeroute';
+    clearPatterns();
-    document.getElementById('routeEdit').submit();
-    break;