bug 13271: Fix zone wizard vlan range validation

bfederle · bfederle · commit 17358cce99bf · 2012-01-31T16:11:23.000-08:00
status 13271: resolved fixed
diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js
@@ -560,6 +560,8 @@
             .attr({ id: networkID })
             .append($form)
         );
+
+        $form.validate();
       });
 
       $tabs.find('li:first').addClass('first');
@@ -937,7 +939,7 @@
         if ($target.closest('div.button.next').size()) {
           var $step = $steps.filter(':visible');
           // Validation
-          var $form = $step.find('form').filter(function() {
+          var $form = $('form:visible').filter(function() {
             // Don't include multi-edit (validation happens separately)
             return !$(this).closest('.multi-edit').size();
           });
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
@@ -353,7 +353,7 @@
           vlanRange: {
             label: 'VLAN Range',
             range: ['vlanRangeStart', 'vlanRangeEnd'],
-            validation: { required: true }
+            validation: { required: true, digits: true }
           }
 					//Advanced (end)
         }

Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@`
`353`	`353`	`vlanRange: {`
`354`	`354`	`label: 'VLAN Range',`
`355`	`355`	`range: ['vlanRangeStart', 'vlanRangeEnd'],`
`356`		`- validation: { required: true }`
	`356`	`+ validation: { required: true, digits: true }`
`357`	`357`	`}`
`358`	`358`	`//Advanced (end)`
`359`	`359`	`}`