').addClass('end')
- );
- });
-
- return false;
- }
-
// User options
if ($target.closest('#user div.icon.options').size()) {
$('#user-options').toggle();
@@ -308,4 +278,4 @@
return true;
});
});
-})(jQuery, window);
+})(jQuery, window.cloudStack ? window.cloudStack : window.cloudStack = {});
diff --git a/ui/scripts/ui/multiEdit.js b/ui/scripts/ui/multiEdit.js
index 68da151222c..49d4438d198 100644
--- a/ui/scripts/ui/multiEdit.js
+++ b/ui/scripts/ui/multiEdit.js
@@ -18,7 +18,7 @@
// Setup columns
$.each(fields, function(fieldName, field) {
if (options.ignoreEmptyFields && !data[fieldName]) {
- return true;
+ return true;
}
var $td = $('
').addClass(fieldName).appendTo($tr);
@@ -95,8 +95,17 @@
$multi.find('th.multi-actions').width() + 4
);
+ // Action filter
+ var allowedActions = options.preFilter ? options.preFilter({
+ context: $.extend(true, {}, options.context, {
+ actions: $.map(actions, function(value, key) { return key; })
+ })
+ }) : null;
+
// Append actions
$.each(actions, function(actionID, action) {
+ if (allowedActions && $.inArray(actionID, allowedActions) == -1) return true;
+
$actions.append(
$('')
.addClass('action')
@@ -110,7 +119,7 @@
var isDestroy = $target.hasClass('destroy');
if (isDestroy) {
- var $loading = _medit.loadingItem($multi, 'Removing rule...');
+ var $loading = _medit.loadingItem($multi, 'Removing...');
if ($expandable.is(':visible')) {
$expandable.slideToggle(function() {
@@ -134,11 +143,11 @@
$('.notifications').notifications('add', {
section: 'network',
desc: notification.label,
- interval: 1000,
+ interval: 500,
_custom: _custom,
poll: function(args) {
var complete = args.complete;
-
+
notification.poll({
_custom: args._custom,
complete: function(args) {
@@ -223,7 +232,7 @@
},
details: function(data, $browser, options) {
if (!options) options = {};
-
+
var detailViewArgs, $detailView;
detailViewArgs = $.extend(true, {}, cloudStack.sections.instances.listView.detailView);
@@ -316,6 +325,7 @@
var noSelect = args.noSelect;
var context = args.context;
var ignoreEmptyFields = args.ignoreEmptyFields;
+ var actionPreFilter = args.actionPreFilter;
var $thead = $(' ').appendTo(
$('').appendTo($inputTable)
@@ -456,12 +466,12 @@
});
// Loading appearance
- var $loading = _medit.loadingItem($multi, 'Adding rule...');
+ var $loading = _medit.loadingItem($multi, 'Adding...');
$dataBody.append($loading);
// Clear out fields
$multi.find('input').val('');
-
+
// Apply action
args.add.action({
context: context,
@@ -474,11 +484,11 @@
$('.notifications').notifications('add', {
section: 'network',
desc: notification.label,
- interval: 3000,
+ interval: 500,
_custom: successArgs._custom,
poll: function(pollArgs) {
var complete = pollArgs.complete;
-
+
notification.poll({
_custom: pollArgs._custom,
complete: function(completeArgs) {
@@ -495,7 +505,8 @@
multipleAdd: multipleAdd,
noSelect: noSelect,
context: context,
- ignoreEmptyFields: ignoreEmptyFields
+ ignoreEmptyFields: ignoreEmptyFields,
+ preFilter: actionPreFilter
}
).appendTo($dataBody);
}
@@ -579,7 +590,8 @@
multipleAdd: multipleAdd,
noSelect: noSelect,
context: $.extend(true, {}, context, this._context),
- ignoreEmptyFields: ignoreEmptyFields
+ ignoreEmptyFields: ignoreEmptyFields,
+ preFilter: actionPreFilter
}
).appendTo($dataBody);
});
diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index be776cb2139..84aff212614 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -69,7 +69,7 @@
if (args.data) $.extend(true, data, args.data);
if (listViewArgs) section = listViewArgs.section;
- notification.desc = messages ?
+ notification.desc = messages ?
messages.notification(messageArgs) : null;
if (listViewArgs)
@@ -226,7 +226,7 @@
}
}
};
-
+
if (action.custom && action.noAdd) {
action.custom({
data: data,
@@ -236,7 +236,7 @@
complete: actionArgs.response.success
});
} else {
- action(actionArgs);
+ action(actionArgs);
}
}
};
@@ -494,7 +494,7 @@
})
.data('list-view-action-id', actionName)
);
-
+
return true;
} else if (action.type == 'checkbox') {
$td.append(
@@ -513,10 +513,10 @@
})
.data('list-view-action-id', actionName)
);
-
+
return true;
}
-
+
$td.append(
$('')
.addClass('action')
@@ -579,7 +579,7 @@
$('').addClass('empty').append(
$('| ').html('No data to show')
).appendTo($tbody)
- ];
+ ];
}
return $tbody.find('tr:last').addClass('last');
@@ -642,7 +642,7 @@
});
var $listView = $tr.closest('.list-view');
- var isUICustom = $listView.data('view-args') ?
+ var isUICustom = $listView.data('view-args') ?
$tr.closest('.list-view').data('view-args').uiCustom : false;
if (options.actionFilter && !isUICustom) {
@@ -651,7 +651,7 @@
actions: allowedActions,
item: dataItem
})
- });
+ });
}
makeActionIcons(
@@ -768,7 +768,7 @@
if (sectionPreFilter && $.inArray(key, sectionPreFilter) == -1) {
return true;
}
-
+
var $sectionButton;
if (!this.type || this.type == 'button') {
@@ -921,9 +921,9 @@
return true;
loadBody(
- $table,
- listViewData.dataProvider,
- listViewData.fields,
+ $table,
+ listViewData.dataProvider,
+ listViewData.fields,
false,
{
page: 1,
@@ -946,6 +946,7 @@
// Infinite scrolling event
$listView.bind('scroll', function(event) {
+ if (args.listView.disableInfiniteScrolling) return false;
if ($listView.find('tr.last, td.loading:visible').size()) return false;
clearTimeout(infScrollTimer);
| |