You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2013/06/25 18:55:17 UTC
git commit: updated refs/heads/master-6-17-stable to 12d7a3d
Updated Branches:
refs/heads/master-6-17-stable 348f0ab02 -> 12d7a3dfb
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/12d7a3df
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/12d7a3df
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/12d7a3df
Branch: refs/heads/master-6-17-stable
Commit: 12d7a3dfb8e427da38eb804a9353b9fb2d09128e
Parents: 348f0ab
Author: Isaac Chiang <is...@gmail.com>
Authored: Thu Jun 20 10:33:21 2013 +0800
Committer: Pranav Saxena <ps...@gmail.com>
Committed: Tue Jun 25 22:24:35 2013 +0530
----------------------------------------------------------------------
ui/scripts/system.js | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/12d7a3df/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 87eb882..a170ce7 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -9164,16 +9164,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];
@@ -9182,17 +9178,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
+ // });
}
});