cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to af91a8a
Date Mon, 24 Jun 2013 23:37:32 GMT
Updated Branches:
  refs/heads/master adeddc2c6 -> af91a8ac8


CLOUDSTACK-3166: UI - VPC section - configure VPC - tier - STATIC NATS - fix a bug that listView
showed nothing.


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

Branch: refs/heads/master
Commit: af91a8ac8de4ce73bafd8caf9b2cc1bd73bdb444
Parents: adeddc2
Author: Jessica Wang <jessicawang@apache.org>
Authored: Mon Jun 24 16:33:56 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Mon Jun 24 16:37:22 2013 -0700

----------------------------------------------------------------------
 ui/scripts/vpc.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/af91a8ac/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 759364d..773409f 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -1397,7 +1397,11 @@
         listView.listView.dataProvider = function(args) {
           $.ajax({
             url: createURL('listPublicIpAddresses'),
-            data: { networkid: args.context.networks[0].id, isstaticnat: true },
+            data: { 
+              networkid: args.context.networks[0].id, 
+              isstaticnat: true,
+              listall: true
+            },
             success: function(json) {
               args.response.success({
                 data: json.listpublicipaddressesresponse.publicipaddress
@@ -3498,7 +3502,10 @@
             $.ajax({
               url: createURL('listPublicIpAddresses'),
               async: false,
-              data: { 'vpcid': args.context.vpc[0].id },
+              data: { 
+            	vpcid: args.context.vpc[0].id,
+            	listAll: true
+              },
               success: function(json) {
                 publicIpAddresses = json.listpublicipaddressesresponse;
               },


Mime
View raw message