Updated Branches: refs/heads/autoscale 1aedc77b9 -> 3d39d44a6
CS-15863: cloudstack 3.0 UI - (1) extend multiEdit widget to be able to hide actions upon an each item's properties. (2) IP Addresses page - load balancer listing - VM listing - hide destroy action for autoscale VM. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3d39d44a Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3d39d44a Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3d39d44a Branch: refs/heads/autoscale Commit: 3d39d44a618220e574871c81e37927414dffb90e Parents: 1aedc77 Author: Jessica Wang <[email protected]> Authored: Fri Aug 17 11:42:31 2012 -0700 Committer: Jessica Wang <[email protected]> Committed: Fri Aug 17 11:48:41 2012 -0700 ---------------------------------------------------------------------- ui/scripts/network.js | 5 +++++ ui/scripts/ui/widgets/multiEdit.js | 6 +++++- 2 files changed, 10 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3d39d44a/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index fb0b766..90b074b 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -2356,6 +2356,11 @@ success: function(data) { lbInstances = data.listloadbalancerruleinstancesresponse.loadbalancerruleinstance ? data.listloadbalancerruleinstancesresponse.loadbalancerruleinstance : []; + + $(lbInstances).each(function() { + if(this.name.indexOf('AutoScale-LB-') > -1) //autoscale VM is not allowed to be deleted manually. So, hide destroy button + this._hideActions = ['destroy']; + }); }, error: function(data) { args.response.error(parseXMLHttpResponse(data)); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3d39d44a/ui/scripts/ui/widgets/multiEdit.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js index 37b9583..5aa9fa1 100644 --- a/ui/scripts/ui/widgets/multiEdit.js +++ b/ui/scripts/ui/widgets/multiEdit.js @@ -597,7 +597,11 @@ var $itemActions = $('<td>').addClass('actions item-actions'); $.each(itemActions, function(itemActionID, itemAction) { - if (itemActionID == 'add') return true; + if (itemActionID == 'add') + return true; + + if(item._hideActions != null && $.inArray(itemActionID, item._hideActions) > -1) + return true; var $itemAction = $('<div>').addClass('action').addClass(itemActionID);
