You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by is...@apache.org on 2013/06/20 04:34:50 UTC
git commit: updated refs/heads/master to 791eb60
Updated Branches:
refs/heads/master b3fb4851e -> 791eb601b
CLOUDSTACK-3069: [UI]Quickview of POD is not displaying any info in UI
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/791eb601
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/791eb601
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/791eb601
Branch: refs/heads/master
Commit: 791eb601b75456d111324e5b9b21a4a4b1edef43
Parents: b3fb485
Author: Isaac Chiang <is...@gmail.com>
Authored: Thu Jun 20 10:33:21 2013 +0800
Committer: Isaac Chiang <is...@gmail.com>
Committed: Thu Jun 20 10:33:21 2013 +0800
----------------------------------------------------------------------
ui/scripts/system.js | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/791eb601/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 6e61397..8df635c 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -1321,13 +1321,6 @@
}
},
- preFilter: function(args) { //Shared networks is only supported in Basic zone and Advanced zone with SG
- if(selectedZoneObj.networktype == "Advanced" && selectedZoneObj.securitygroupsenabled != true)
- return false;
- else
- return true;
- },
-
createForm: {
title: 'label.add.guest.network', //Add guest network in advanced zone
@@ -9625,16 +9618,12 @@
$.ajax({
url: createURL("listPods&id=" + args.context.pods[0].id),
- dataType: "json",
- async: false,
success: function(json) {
var item = json.listpodsresponse.pod[0];
$.ajax({
url:createURL("listDedicatedPods&podid=" +args.context.pods[0].id),
- dataType:"json",
- async:false,
success:function(json){
if(json.listdedicatedpodsresponse.dedicatedpod != undefined){
var podItem = json.listdedicatedpodsresponse.dedicatedpod[0];
@@ -9643,17 +9632,22 @@
}
}
else
- $.extend(item ,{ isdedicated: 'No' })
+ $.extend(item ,{ isdedicated: 'No' });
+
+ args.response.success({
+ actionFilter: podActionfilter,
+ data: item
+ });
},
error:function(json){
args.response.error(parseXMLHttpResponse(XMLHttpResponse));
}
});
- args.response.success({
- actionFilter: podActionfilter,
- data: item
- });
+ // args.response.success({
+ // actionFilter: podActionfilter,
+ // data: item
+ // });
}
});