From 739928921a392de637ca01baf44f24b01c4a2abf Mon Sep 17 00:00:00 2001
From: jiahuay <jiahua.yan@huawei.com>
Date: Fri, 26 Sep 2014 16:45:24 -0700
Subject: [PATCH] Fix subnet_id null bug for newly added subnets

Change-Id: I60dd656e35e1f5c7e4496f8e981462a7f586c414
---
 v2/assets/css/style.css     | 3 +++
 v2/src/app/appDev.js        | 2 +-
 v2/src/app/wizard/wizard.js | 7 ++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/v2/assets/css/style.css b/v2/assets/css/style.css
index 09370c4..a429eb7 100644
--- a/v2/assets/css/style.css
+++ b/v2/assets/css/style.css
@@ -124,6 +124,9 @@ select {
     border-radius: 7px;
     height: 33px;
 }
+select option[value=""], select.form-control option[value=""] {
+    padding: 3px 4px;
+}
 .opacity-zero {
     opacity: 0;
 }
diff --git a/v2/src/app/appDev.js b/v2/src/app/appDev.js
index 6bd2a92..4a98e7e 100644
--- a/v2/src/app/appDev.js
+++ b/v2/src/app/appDev.js
@@ -813,7 +813,7 @@ compassAppDev.run(function($httpBackend, settings, $http) {
         console.log(method, url, data);
 
         var subnetConfig = JSON.parse(data);
-        subnetConfig.subnet_id = Math.floor((Math.random() * 100) + 1);
+        subnetConfig.id = Math.floor((Math.random() * 100) + 1);
 
         console.log(subnetConfig);
         return [200, subnetConfig, {}];
diff --git a/v2/src/app/wizard/wizard.js b/v2/src/app/wizard/wizard.js
index 54d5496..e92058a 100644
--- a/v2/src/app/wizard/wizard.js
+++ b/v2/src/app/wizard/wizard.js
@@ -1749,7 +1749,7 @@ var addSubnetModalInstanceCtrl = function($scope, $modalInstance, $q, subnets, d
     };
 
     $scope.ok = function() {
-        var subnetworks = [];
+        var newsubnetworks = [];
         var promises = [];
         angular.forEach($scope.subnetworks, function(subnet) {
             var requestData = {
@@ -1758,7 +1758,7 @@ var addSubnetModalInstanceCtrl = function($scope, $modalInstance, $q, subnets, d
             if (subnet.id === undefined) {
                 // post subnetworks
                 var updateSubnetConfig = dataService.postSubnetConfig(requestData).then(function(subnetData) {
-                    subnetworks.push(subnetData.data);
+                    newsubnetworks.push(subnetData.data);
                 }, function(response) {
                     return $q.reject(response);
                 });
@@ -1766,7 +1766,7 @@ var addSubnetModalInstanceCtrl = function($scope, $modalInstance, $q, subnets, d
             } else {
                 // put subnetworks
                 var updateSubnetConfig = dataService.putSubnetConfig(subnet.id, requestData).then(function(subnetData) {
-                    subnetworks.push(subnetData.data);
+                    newsubnetworks.push(subnetData.data);
                 }, function(response) {
                     return $q.reject(response);
                 });
@@ -1775,6 +1775,7 @@ var addSubnetModalInstanceCtrl = function($scope, $modalInstance, $q, subnets, d
         });
 
         $q.all(promises).then(function() {
+            $scope.subnetworks = newsubnetworks;
             for (var i = 0; i < subnets.length && i < $scope.subnetworks.length; i++) {
                 $scope.subnetworks[i].$$hashKey = subnets[i].$$hashKey;
             }