cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [09/50] [abbrv] git commit: updated refs/heads/reporter to b26f3fc
Date Fri, 02 Jan 2015 14:36:01 GMT
CLOUDSTACK-6666: UI > network > VPC > Router > Public IP Addresses > IP Address
detailView > Configuration tab > Port Forwarding > Select VM screen > implement
keyword search.


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

Branch: refs/heads/reporter
Commit: 8bcde024a8fbdf284c36f50131360a387d8be9d2
Parents: 54db0d2
Author: Jessica Wang <jessicawang@apache.org>
Authored: Fri Dec 19 14:26:42 2014 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Fri Dec 19 14:28:15 2014 -0800

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bcde024/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 0a46fa0..44e66b6 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -4120,18 +4120,18 @@
                                                     dataProvider: singleVmSecondaryIPSubselect
                                                 },
                                                 dataProvider: function(args) {
-                                                    var networkid;
-                                                    if ('vpc' in args.context)
+                                                	var data = {};
+                                                    listViewDataProvider(args, data);
+                                                	
+                                                	var networkid;
+                                                    if ('vpc' in args.context) {
                                                         networkid = args.context.multiData.tier;
-                                                    else
+                                                    } else {
                                                         networkid = args.context.ipAddresses[0].associatednetworkid;
-
-                                                    var data = {
-                                                        page: args.page,
-                                                        pageSize: pageSize,
-                                                        listAll: true,
-                                                        networkid: networkid
-                                                    };
+                                                    }                                   
                
+                                                    $.extend(data, {
+                                                    	networkid: networkid
+                                                    });    
 
                                                     if (!args.context.projects) {
                                                         $.extend(data, {


Mime
View raw message