You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/04/09 21:50:39 UTC
[1/3] git commit: updated refs/heads/ui-add-remove-nics to 564a850
Updated Branches:
refs/heads/master 1a5162f4d -> 685a8a72c
refs/heads/ui-add-remove-nics 4f5d31184 -> 564a850f1
WIP
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/564a850f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/564a850f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/564a850f
Branch: refs/heads/ui-add-remove-nics
Commit: 564a850f1b6aa227b02c732d8f095569858ec3c0
Parents: 4f5d311
Author: Brian Federle <br...@citrix.com>
Authored: Mon Apr 8 16:37:27 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Apr 8 16:37:27 2013 -0700
----------------------------------------------------------------------
ui/scripts/instances.js | 2 +-
ui/scripts/ui/widgets/detailView.js | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/564a850f/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index d4cc57f..3c9696d 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1284,7 +1284,7 @@
},
// Remove NIC/Network from VM
- remove: {
+ destroy: {
label: 'label.action.delete.network',
messages: {
confirm: function(args) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/564a850f/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js
index ddb62f0..54f4166 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -57,7 +57,10 @@
* Default behavior for actions -- just show a confirmation popup and add notification
*/
standard: function($detailView, args, additional) {
- var action = args.actions[args.actionName];
+ var tab = args.tabs[args.activeTab];
+ var isMultiple = tab.multiple;
+
+ var action = isMultiple ? tab.actions[args.actionName] : args.actions[args.actionName];
var preAction = action.preAction;
var notification = action.notification ?
action.notification : {};
@@ -1078,7 +1081,7 @@
}
// Add action bar
- if (tabData.actions) {
+ if (tabData.multiple && tabData.actions) {
var $actions = makeActionButtons(tabData.actions, {
actionFilter: tabData.actions.actionFilter,
data: item,
[3/3] git commit: updated refs/heads/master to 685a8a7
Posted by bf...@apache.org.
multiEdit, action pre-filter: pass 'actions' in options object
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/685a8a72
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/685a8a72
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/685a8a72
Branch: refs/heads/master
Commit: 685a8a72ceea51d06bac39ec81e5716288185787
Parents: 6a1d384
Author: Brian Federle <br...@citrix.com>
Authored: Tue Apr 9 12:50:02 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Apr 9 12:50:17 2013 -0700
----------------------------------------------------------------------
ui/scripts/ui/widgets/multiEdit.js | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/685a8a72/ui/scripts/ui/widgets/multiEdit.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js
index 2cb04147..27b14d1 100755
--- a/ui/scripts/ui/widgets/multiEdit.js
+++ b/ui/scripts/ui/widgets/multiEdit.js
@@ -240,6 +240,7 @@
// Action filter
var allowedActions = options.preFilter ? options.preFilter({
+ actions: $.map(actions, function(value, key) { return key; }),
context: $.extend(true, {}, options.context, {
multiRule: [data],
actions: $.map(actions, function(value, key) { return key; })
[2/3] git commit: updated refs/heads/master to 685a8a7
Posted by bf...@apache.org.
multiEdit: Support createForm for actions
If 'createForm' block is specified in a multi-edit action, show
createForm and pass fields to action.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a1d3847
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a1d3847
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a1d3847
Branch: refs/heads/master
Commit: 6a1d38476101429ad149617b684a31f80afcc0f7
Parents: 1a5162f
Author: Brian Federle <br...@citrix.com>
Authored: Mon Apr 8 17:14:03 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Apr 9 12:50:08 2013 -0700
----------------------------------------------------------------------
ui/scripts/ui/widgets/multiEdit.js | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a1d3847/ui/scripts/ui/widgets/multiEdit.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js
index 0a05591..2cb04147 100755
--- a/ui/scripts/ui/widgets/multiEdit.js
+++ b/ui/scripts/ui/widgets/multiEdit.js
@@ -323,6 +323,7 @@
var $expandable = $dataItem.find('.expandable-listing');
var isDestroy = $target.hasClass('destroy');
var isEdit = $target.hasClass('edit');
+ var createForm = action.createForm;
if (isDestroy) {
var $loading = _medit.loadingItem($multi, _l('label.removing') + '...');
@@ -340,7 +341,19 @@
}
if (!isEdit) {
- performAction();
+ if (createForm) {
+ cloudStack.dialog.createForm({
+ form: createForm,
+ after: function(args) {
+ var $loading = $('<div>').addClass('loading-overlay').prependTo($dataItem);
+ performAction({ data: args.data, complete: function() {
+ $multi.trigger('refresh');
+ } });
+ }
+ });
+ } else {
+ performAction();
+ }
} else {
// Get editable fields
var editableFields = {};