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

Detail view/list view: Pass context to confirm messages

Browse Source
This commit is contained in:
Brian Federle 2012-11-13 10:37:39 -08:00
parent 792c6c0082
commit 456202162c
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/scripts/ui/widgets/detailView.js
View File

@ -62,13 +62,16 @@
var notification = action.notification ?
action.notification : {};
var messages = action.messages;
var messageArgs = { name: $detailView.find('tr.name td.value').html() };
var id = args.id;
var context = $detailView.data('view-args').context;
var _custom = $detailView.data('_custom');
var customAction = action.action.custom;
var noAdd = action.noAdd;
var noRefresh = additional.noRefresh;
var messageArgs = {
name: $detailView.find('tr.name td.value').html(),
context: context
};
// Handle pre-action (occurs before any other behavior happens)
if (preAction) {

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

@ -23,7 +23,6 @@
var listViewArgs = $instanceRow.closest('div.list-view').data('view-args');
var notification = args.action.notification ? args.action.notification : {};
var messages = args.action ? args.action.messages : {};
var messageArgs = { name: $instanceRow.find('td.name span').html() };
var preAction = args.action ? args.action.preAction : {};
var action = args.action ? args.action.action : {};
var section;
@ -32,6 +31,9 @@
jsonObj: $instanceRow.data('jsonObj')
};
var $listView = $instanceRow.closest('.list-view');
var messageArgs = {
name: $instanceRow.find('td.name span').html()
};
if (args.data) $.extend(true, data, args.data);
if (listViewArgs) section = listViewArgs.section;
@ -269,14 +271,17 @@
};
var context = $.extend({}, listViewArgs.context);
context[
listViewArgs.activeSection
] = [$instanceRow.data('jsonObj')];
messageArgs.context = context;
if (!args.action.action.externalLink &&
!args.action.createForm &&
args.action.addRow != 'true' &&
!action.custom && !action.uiCustom)
!action.custom && !action.uiCustom) {
cloudStack.dialog.confirm({
message: messages.confirm(messageArgs),
action: function() {
@ -287,9 +292,9 @@
});
}
});
else if (action.custom || action.uiCustom)
} else if (action.custom || action.uiCustom) {
performAction();
else {
} else {
var addRow = args.action.addRow == "false" ? false : true;
var isHeader = args.action.isHeader;
var createFormContext = $.extend({}, context);