Fix _hideFields array not hiding add VM button
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/abbfd740 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/abbfd740 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/abbfd740 Branch: refs/heads/vpc Commit: abbfd740776d7214cb4e3976c263a3075be63566 Parents: 340b086 Author: Brian Federle <[email protected]> Authored: Fri Aug 10 14:02:41 2012 -0700 Committer: Brian Federle <[email protected]> Committed: Fri Aug 10 14:03:17 2012 -0700 ---------------------------------------------------------------------- ui/css/cloudstack3.css | 2 +- ui/scripts/ui/widgets/multiEdit.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/abbfd740/ui/css/cloudstack3.css ---------------------------------------------------------------------- diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index ac27ff5..e9f5a54 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); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/abbfd740/ui/scripts/ui/widgets/multiEdit.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js index cece45e..8ecd520 100644 --- a/ui/scripts/ui/widgets/multiEdit.js +++ b/ui/scripts/ui/widgets/multiEdit.js @@ -139,6 +139,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, @@ -147,6 +149,8 @@ { multiRule: multiRule }); + + return true; }); $td.append($addButton); } else {
