incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [24/31] git commit: Fix _hideFields array not hiding add VM button
Date Sun, 12 Aug 2012 01:28:51 GMT
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/66e3387b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/66e3387b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/66e3387b

Branch: refs/heads/vpc
Commit: 66e3387b2ac6118fb46ea11522a9d335012a32a1
Parents: 263216c
Author: Brian Federle <brian.federle@citrix.com>
Authored: Fri Aug 10 14:02:41 2012 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Fri Aug 10 14:03: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/66e3387b/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 6f7cf93..c1df0a7 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/66e3387b/ui/scripts/ui/widgets/multiEdit.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js
index 17388bd..0a5ce14 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 {


Mime
View raw message