From 66e3387b2ac6118fb46ea11522a9d335012a32a1 Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Fri, 10 Aug 2012 14:02:41 -0700 Subject: [PATCH] Fix _hideFields array not hiding add VM button --- ui/css/cloudstack3.css | 2 +- ui/scripts/ui/widgets/multiEdit.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index 6f7cf937a6e..c1df0a7ebf2 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -6802,7 +6802,7 @@ div.panel.ui-dialog div.list-view div.fixed-header { text-shadow: 0px 1px #FFFFFF; } -.multi-edit .disabled .button.custom-action { +.multi-edit .disabled .button.add-vm { /*+opacity:50%;*/ filter: alpha(opacity=50); -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50); diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js index 17388bd9890..0a5ce14aef0 100644 --- a/ui/scripts/ui/widgets/multiEdit.js +++ b/ui/scripts/ui/widgets/multiEdit.js @@ -138,6 +138,8 @@ } else if (field.addButton && !options.noSelect) { if (options.multipleAdd) { $addButton.click(function() { + if ($td.hasClass('disabled')) return false; + _medit.vmList($multi, options.listView, options.context, @@ -146,6 +148,8 @@ { multiRule: multiRule }); + + return true; }); $td.append($addButton); } else {