From 17358cce99bfed2a27a523cb14f4f3f9df67fa96 Mon Sep 17 00:00:00 2001
From: bfederle <bfederle@gmail.com>
Date: Tue, 31 Jan 2012 16:11:19 -0800
Subject: [PATCH] bug 13271: Fix zone wizard vlan range validation

status 13271: resolved fixed
---
 ui/scripts/ui-custom/zoneWizard.js | 4 +++-
 ui/scripts/zoneWizard.js           | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js
index 9013a41b6ca..18511e90bff 100644
--- 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
index d2296827245..51420e3841a 100644
--- 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)
         }