apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

List view: fix for header actions

Browse Source
This commit is contained in:
bfederle 2012-02-01 10:30:18 -08:00
parent 32f0b3e590
commit ea512c2829
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ui/scripts/ui/widgets/listView.js
View File

@ -41,6 +41,7 @@
if (!options) options = {};
var $form = options.$form;
var isHeader = options.isHeader;
$instanceRow = options.$item ? options.$item : $instanceRow;
var $item = options.$item;
@ -66,7 +67,7 @@
cloudStack.ui.notifications.add(
notification,
function(args) {
if ($item.is(':visible')) {
if ($item.is(':visible') && !isHeader) {
replaceItem(
$item,
args.data,
@ -106,7 +107,7 @@
$prevRow.data($instanceRow.data());
// Set loading appearance
if (args.data) {
if (args.data && !isHeader) {
$instanceRow = replaceItem(
$instanceRow,
$.extend($instanceRow.data('json-obj'), args.data),
@ -137,21 +138,19 @@
var actionFilter = args.actionFilter ?
args.actionFilter : $instanceRow.data('list-view-action-filter');
if ($instanceRow.is(':visible')) {
if (args.data) {
$newRow = replaceItem(
$instanceRow,
$.extend($instanceRow.data('json-obj'), args.data),
actionFilter
);
}
else {
// Nothing new, so just put in existing data
$newRow = replaceItem(
$instanceRow,
$instanceRow.data('json-obj'),
actionFilter
);
if (!isHeader) {
if ($instanceRow.is(':visible')) {
if (args.data) {
$newRow = replaceItem($instanceRow,
$.extend($instanceRow.data('json-obj'), args.data),
actionFilter);
}
else {
// Nothing new, so just put in existing data
$newRow = replaceItem($instanceRow,
$instanceRow.data('json-obj'),
actionFilter);
}
}
if (additional && additional.complete)
@ -266,7 +265,8 @@
performAction(args.data, {
ref: args.ref,
context: createFormContext,
$form: args.$form
$form: args.$form,
isHeader: isHeader
});
}
},
@ -278,7 +278,7 @@
message: messages.confirm(messageArgs),
action: function() {
var $newItem;
if (addRow != false && !action.isHeader) {
if (addRow && !action.isHeader) {
$newItem = $listView.listView('prependItem', {
data: [
$.extend(args.data, {
@ -1417,7 +1417,6 @@
)[0];
$newRow.data('json-obj', data);
$row.replaceWith($newRow);
$table.dataTable('refresh');