Updated Branches: refs/heads/master 4ecf6df5f -> 10cd11637
CLOUDSTACK-5266: Fix quickview not working for VR sections Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/10cd1163 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/10cd1163 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/10cd1163 Branch: refs/heads/master Commit: 10cd11637afbc89915df4d22a3eaddecbbfc988e Parents: 4ecf6df Author: Brian Federle <[email protected]> Authored: Wed Dec 4 08:59:59 2013 -0800 Committer: Brian Federle <[email protected]> Committed: Wed Dec 4 09:00:16 2013 -0800 ---------------------------------------------------------------------- ui/scripts/system.js | 29 ++++++++++++++++++----------- ui/scripts/ui/widgets/detailView.js | 3 ++- 2 files changed, 20 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10cd1163/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 7e4bb61..9dd5190 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -8380,10 +8380,13 @@ args.context.routerGroupByZone[0].routerRequiresUpgrade = 0; } } - }); - args.response.success({ - data: args.context.routerGroupByZone[0] - }) + }); + + setTimeout(function() { + args.response.success({ + data: args.context.routerGroupByZone[0] + }) + }); } } } @@ -8600,9 +8603,11 @@ } } }); - args.response.success({ - data: args.context.routerGroupByPod[0] - }) + setTimeout(function() { + args.response.success({ + data: args.context.routerGroupByPod[0] + }); + }); } } } @@ -8822,9 +8827,11 @@ } } }); - args.response.success({ - data: args.context.routerGroupByCluster[0] - }) + setTimeout(function() { + args.response.success({ + data: args.context.routerGroupByCluster[0] + }); + }); } } } @@ -17887,7 +17894,7 @@ jsonObj["redundantRouterState"] = jsonObj.redundantstate; } else { jsonObj["redundantRouterState"] = ""; - } + } } var refreshNspData = function(nspName) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10cd1163/ui/scripts/ui/widgets/detailView.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js index b0ebaa9..4c40ec8 100644 --- a/ui/scripts/ui/widgets/detailView.js +++ b/ui/scripts/ui/widgets/detailView.js @@ -93,7 +93,8 @@ var $detailViewElems = $detailView.find('ul.ui-tabs-nav, .detail-group').remove(); var viewArgs = $detailView.data('view-args'); var context = viewArgs.context; - var activeContextItem = viewArgs.section ? context[viewArgs.section][0] : null; + var activeContextItem = viewArgs.section && context[viewArgs.section] ? + context[viewArgs.section][0] : null; $detailView.tabs('destroy'); $detailView.data('view-args').jsonObj = newData;
