diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index 3fa8f5418e6..53b37f187eb 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -1330,9 +1330,24 @@
var itemID = $tr.data('list-view-item-id');
var jsonObj = $tr.data('json-obj');
var $loading = $('
').addClass('loading-overlay').appendTo($detailsContainer);
+ var listViewArgs = $listView.data('view-args');
+ var listViewActiveSection = activeSection;
+ var targetSection;
if ($tr.hasClass('loading')) return;
+ if (listViewActiveSection != '_zone') {
+ if (listViewArgs.sections &&
+ listViewArgs.sections[listViewActiveSection] &&
+ listViewArgs.sections[listViewActiveSection].id) {
+ targetSection = listViewArgs.sections[listViewActiveSection].id;
+ } else {
+ targetSection = listViewActiveSection;
+ }
+ } else {
+ targetSection = detailViewArgs.section;
+ }
+
// Title
$title.append(
$('').html(_l('label.quickview') + ': '),
@@ -1352,7 +1367,7 @@
if (!$quickViewTooltip.is(':visible')) return;
// Init detail view
- context[activeSection] = [jsonObj];
+ context[targetSection] = [jsonObj];
createDetailView({
data: $.extend(true, {}, detailView, {
onLoad: function($detailView) {
@@ -1998,13 +2013,24 @@
var listViewArgs = $listView.data('view-args');
+ var targetSection;
+
detailViewArgs.section = listViewArgs.activeSection ?
listViewArgs.activeSection : listViewArgs.id;
- detailViewArgs.context[
- listViewActiveSection != '_zone' ?
- listViewActiveSection : detailViewArgs.section
- ] = [jsonObj];
+ if (listViewActiveSection != '_zone') {
+ if (listViewArgs.sections &&
+ listViewArgs.sections[listViewActiveSection] &&
+ listViewArgs.sections[listViewActiveSection].id) {
+ targetSection = listViewArgs.sections[listViewActiveSection].id;
+ } else {
+ targetSection = listViewActiveSection;
+ }
+ } else {
+ targetSection = detailViewArgs.section;
+ }
+
+ detailViewArgs.context[targetSection] = [jsonObj];
if ($.isFunction(detailViewArgs.data)) {
detailViewArgs.data = detailViewArgs.data({