Detail view: Fix error on refresh from async action Fixes error on detail view actions when list view subsection has a custom ID
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d34efd2d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d34efd2d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d34efd2d Branch: refs/heads/4.3 Commit: d34efd2dcb90e5dc1fec362461a4941712b607d0 Parents: c1457fa Author: Brian Federle <[email protected]> Authored: Wed Dec 4 09:39:52 2013 -0800 Committer: Brian Federle <[email protected]> Committed: Wed Dec 4 09:40:16 2013 -0800 ---------------------------------------------------------------------- ui/scripts/ui/widgets/detailView.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d34efd2d/ui/scripts/ui/widgets/detailView.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js index 4c40ec8..3a3cd79 100644 --- a/ui/scripts/ui/widgets/detailView.js +++ b/ui/scripts/ui/widgets/detailView.js @@ -46,11 +46,13 @@ // Refresh detail view context if ($detailView) { - $.extend( - $detailView.data('view-args').context[ - $detailView.data('view-args').section - ][0], newData - ); + var detailViewArgs = $detailView.data('view-args'); + var listViewArgs = $listView.data('view-args'); + var contextID = listViewArgs.sections && listViewArgs.sections[detailViewArgs.section].id ? + listViewArgs.sections[detailViewArgs.section].id : + detailViewArgs.section; + + $.extend($detailView.data('view-args').context[contextID][0], newData); } };
