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/11/01 00:40:20 UTC
[1/3] git commit: updated refs/heads/master to 2e07c45
Updated Branches:
refs/heads/master b704d5b8d -> 2e07c452e
Events UI: Implement multi-select delete/archive actions
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e8f81853
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e8f81853
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e8f81853
Branch: refs/heads/master
Commit: e8f8185393d7ad6d9acad3780161f65e8c6e703b
Parents: ccab740
Author: Brian Federle <br...@citrix.com>
Authored: Thu Oct 31 16:37:24 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Oct 31 16:40:00 2013 -0700
----------------------------------------------------------------------
ui/css/cloudstack3.css | 1 +
ui/scripts/events.js | 73 +++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 72 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8f81853/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 3e5ab98..3473524 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -11836,6 +11836,7 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it
.destroy .icon,
.expunge .icon,
.remove .icon,
+.removeMulti .icon,
.delete .icon,
.decline .icon,
.deleteacllist .icon {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8f81853/ui/scripts/events.js
----------------------------------------------------------------------
diff --git a/ui/scripts/events.js b/ui/scripts/events.js
index 38f7136..f432bc4 100644
--- a/ui/scripts/events.js
+++ b/ui/scripts/events.js
@@ -34,6 +34,7 @@
listView: {
id: 'events',
label: 'label.menu.events',
+ multiSelect: true,
fields: {
description: {
label: 'label.description'
@@ -58,6 +59,40 @@
actions: {
// Remove multiple events
+ removeMulti: {
+ label: 'label.delete.events',
+ isHeader: true,
+ addRow: false,
+ isMultiSelectAction: true,
+ messages: {
+ confirm: function(args) {
+ return 'Please confirm you would like to remove the selected events';
+ },
+ notification: function(args) {
+ return 'label.delete.events';
+ }
+ },
+ action: function(args) {
+ var events = args.context.events;
+
+ $.ajax({
+ url: createURL("deleteEvents"),
+ data: {
+ ids: $(events).map(function(index, event) {
+ return event.id;
+ }).toArray().join(',')
+ },
+ success: function(data) {
+ args.response.success();
+ $(window).trigger('cloudStack.fullRefresh');
+ },
+ error:function(data) {
+ args.response.error(parseXMLHttpResponse(data));
+ }
+ });
+ }
+ },
+
remove: {
label: 'label.delete.events',
isHeader: true,
@@ -118,8 +153,7 @@
});
}
},
-
- // Archive multiple events
+
archive: {
label: 'label.archive.events',
isHeader: true,
@@ -179,6 +213,41 @@
});
}
+ },
+
+ // Archive multiple events
+ archiveMulti: {
+ label: 'label.archive.events',
+ isHeader: true,
+ addRow: false,
+ isMultiSelectAction: true,
+ messages: {
+ confirm: function(args) {
+ return 'Please confirm you would like to archive the selected events';
+ },
+ notification: function(args) {
+ return 'label.archive.events';
+ }
+ },
+ action: function(args) {
+ var events = args.context.events;
+
+ $.ajax({
+ url: createURL("archiveEvents"),
+ data: {
+ ids: $(events).map(function(index, event) {
+ return event.id;
+ }).toArray().join(',')
+ },
+ success: function(data) {
+ args.response.success();
+ $(window).trigger('cloudStack.fullRefresh');
+ },
+ error:function(data) {
+ args.response.error(parseXMLHttpResponse(data));
+ }
+ });
+ }
}
},
[2/3] git commit: updated refs/heads/master to 2e07c45
Posted by bf...@apache.org.
List view: Fix refresh not loading multi-select column
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ccab7401
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ccab7401
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ccab7401
Branch: refs/heads/master
Commit: ccab74012966328ac6d5897907282a57182dd244
Parents: b704d5b
Author: Brian Federle <br...@citrix.com>
Authored: Thu Oct 31 16:33:48 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Oct 31 16:40:00 2013 -0700
----------------------------------------------------------------------
ui/scripts/ui/widgets/listView.js | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ccab7401/ui/scripts/ui/widgets/listView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index fad2a5e..3fa8f54 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -2192,6 +2192,7 @@
false,
null,
listViewArgs.actions, {
+ multiSelect: listViewArgs.multiSelect,
context: this.data('view-args').context,
detailView: listViewArgs.detailView
}
[3/3] git commit: updated refs/heads/master to 2e07c45
Posted by bf...@apache.org.
Alerts UI: Implement multi-select delete/archive alerts
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2e07c452
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2e07c452
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2e07c452
Branch: refs/heads/master
Commit: 2e07c452e3718e8c24818a78f7a9c6f5d6be78c6
Parents: e8f8185
Author: Brian Federle <br...@citrix.com>
Authored: Thu Oct 31 16:39:42 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Oct 31 16:40:01 2013 -0700
----------------------------------------------------------------------
ui/scripts/events.js | 69 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e07c452/ui/scripts/events.js
----------------------------------------------------------------------
diff --git a/ui/scripts/events.js b/ui/scripts/events.js
index f432bc4..fdc496e 100644
--- a/ui/scripts/events.js
+++ b/ui/scripts/events.js
@@ -453,6 +453,7 @@
listView: {
id: 'alerts',
label: 'label.menu.alerts',
+ multiSelect: true,
fields: {
description: {
label: 'label.description'
@@ -468,6 +469,40 @@
actions: {
// Remove multiple Alerts
+ removeMulti: {
+ label: 'label.delete.alerts',
+ isHeader: true,
+ addRow: false,
+ isMultiSelectAction: true,
+ messages: {
+ confirm: function(args) {
+ return 'Please confirm you would like to remove the selected alerts';
+ },
+ notification: function(args) {
+ return 'label.delete.alerts';
+ }
+ },
+ action: function(args) {
+ var events = args.context.alerts;
+
+ $.ajax({
+ url: createURL("deleteAlerts"),
+ data: {
+ ids: $(events).map(function(index, event) {
+ return event.id;
+ }).toArray().join(',')
+ },
+ success: function(data) {
+ args.response.success();
+ $(window).trigger('cloudStack.fullRefresh');
+ },
+ error:function(data) {
+ args.response.error(parseXMLHttpResponse(data));
+ }
+ });
+ }
+ },
+
remove: {
label: 'label.delete.alerts',
isHeader: true,
@@ -533,6 +568,40 @@
},
// Archive multiple Alerts
+ archiveMulti: {
+ label: 'label.archive.alerts',
+ isHeader: true,
+ addRow: false,
+ isMultiSelectAction: true,
+ messages: {
+ confirm: function(args) {
+ return 'Please confirm you would like to archive the selected alerts';
+ },
+ notification: function(args) {
+ return 'label.archive.alerts';
+ }
+ },
+ action: function(args) {
+ var events = args.context.alerts;
+
+ $.ajax({
+ url: createURL("archiveAlerts"),
+ data: {
+ ids: $(events).map(function(index, event) {
+ return event.id;
+ }).toArray().join(',')
+ },
+ success: function(data) {
+ args.response.success();
+ $(window).trigger('cloudStack.fullRefresh');
+ },
+ error:function(data) {
+ args.response.error(parseXMLHttpResponse(data));
+ }
+ });
+ }
+ },
+
archive: {
label: 'label.archive.alerts',
isHeader: true,