Repository: cloudstack
Updated Branches:
  refs/heads/4.4 dd88720c9 -> 0ef9c9a1c


CLOUDSTACK-6438: WIP: If VM has additional IPs, keep showing in add screen


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0e002ffa
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0e002ffa
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0e002ffa

Branch: refs/heads/4.4
Commit: 0e002ffa84a11c7a2ce2e684959cb203e4cc860e
Parents: dd88720
Author: Brian Federle <brian.fede...@citrix.com>
Authored: Thu May 1 13:13:28 2014 -0700
Committer: Daan Hoogland <d...@onecht.net>
Committed: Fri May 2 20:25:16 2014 +0200

----------------------------------------------------------------------
 ui/scripts/network.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0e002ffa/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index f0141b6..10d5a05 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -3380,6 +3380,28 @@
                                                                         return 
item.id == instance.id;
                                                                     }).length;
 
+                                                                    // Check 
if there are any remaining IPs
+                                                                    if 
(!notExisting) {
+                                                                        
$.ajax({
+                                                                            
url: createURL('listNics'),
+                                                                            
async: false,
+                                                                            
data: {
+                                                                               
 virtualmachineid: instance.id
+                                                                            },
+                                                                            
success: function(json) {
+                                                                               
 var nics = json.listnicsresponse.nic;
+
+                                                                               
 $(nics).map(function (index, nic) {
+                                                                               
     if (nic.secondaryip) {
+                                                                               
         notExisting = true;
+
+                                                                               
         return false;
+                                                                               
     }
+                                                                               
 });
+                                                                            }
+                                                                        })
+                                                                    }
+
                                                                     return 
nonAutoScale && isActiveState && notExisting;
                                                                 }
                                                             );

Reply via email to