From ccec9e75daf89c718fa0739793dc6d25b9825eb5 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Thu, 16 Aug 2012 13:43:49 -0700
Subject: [PATCH] CS-16016: Reset input field to default value on add

Conflicts:
	ui/scripts/vpc.js
---
 ui/scripts/ui/widgets/multiEdit.js | 21 ++++++++++++++++++---
 ui/scripts/vpc.js                  |  4 ++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js
index 355ebbe8822..e4fc026765b 100644
--- a/ui/scripts/ui/widgets/multiEdit.js
+++ b/ui/scripts/ui/widgets/multiEdit.js
@@ -782,7 +782,11 @@
                   );
 
             if (field.isDisabled) $input.hide();
-            if (field.defaultValue) $input.val(field.defaultValue);
+
+            if (field.defaultValue) {
+              $input.val(field.defaultValue);
+              $input.data('multi-default-value', field.defaultValue);
+            }
           });
         } else {
           var $input = $('<input>')
@@ -795,7 +799,10 @@
                 .appendTo($td);
 
           if (field.isDisabled) $input.hide();
-          if (field.defaultValue) $input.val(field.defaultValue);
+          if (field.defaultValue) {
+            $input.val(field.defaultValue);
+            $input.data('multi-default-value', field.defaultValue);
+          }
         }
       } else if (field.custom) {
         $('<div>').addClass('button add-vm custom-action')
@@ -887,7 +894,15 @@
         $dataBody.prepend($loading);
 
         // Clear out fields
-        $multi.find('input').val('');
+        $multi.find('input').each(function() {
+          var $input = $(this);
+
+          if ($input.data('multi-default-value')) {
+            $input.val($input.data('multi-default-value'));
+          } else {
+            $input.val('');
+          }
+        });
         $multi.find('tbody td').each(function() {
           var $item = $(this);
 
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index d25458b6c9c..8d790403f88 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -111,8 +111,8 @@
           });
         }
       },
-      'icmptype': { edit: true, label: 'ICMP.type', isDisabled: true , desc:'Please specify -1 if you want to allow any', defaultValue:'-1'},
-      'icmpcode': { edit: true, label: 'ICMP.code', isDisabled: true , desc:'Please specify -1 if you want to allow any', defaultValue:'-1'},
+      'icmptype': { edit: true, label: 'ICMP.type', isDisabled: true, desc:'Please specify -1 if you want to allow all ICMP types', defaultValue:'-1' },
+      'icmpcode': { edit: true, label: 'ICMP.code', isDisabled: true, desc:'Please specify -1 if you want to allow all ICMP codes', defaultValue:'-1' },
       'traffictype' : {
         label: 'Traffic type',
         select: function(args) {