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 2012/08/10 23:04:27 UTC
[1/3] git commit: Fix _hideFields array not hiding add VM button
Updated Branches:
refs/heads/autoscale 1a1565987 -> 47939c42b
refs/heads/master 263216caa -> 66e3387b2
refs/heads/vpc 340b086df -> abbfd7407
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/47939c42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/47939c42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/47939c42
Branch: refs/heads/autoscale
Commit: 47939c42be61ffd9f94dce782189f59d6a6ffcfa
Parents: 1a15659
Author: Brian Federle <br...@citrix.com>
Authored: Fri Aug 10 14:02:41 2012 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Fri Aug 10 14:04:00 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/47939c42/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 9c3826b..28f1e26 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -6782,7 +6782,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/47939c42/ui/scripts/ui/widgets/multiEdit.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js
index 535a0a5..e87af42 100644
--- a/ui/scripts/ui/widgets/multiEdit.js
+++ b/ui/scripts/ui/widgets/multiEdit.js
@@ -146,6 +146,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,
@@ -154,6 +156,8 @@
{
multiRule: multiRule
});
+
+ return true;
});
$td.append($addButton);
} else {