cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [1/2] git commit: updated refs/heads/master to a9258ae
Date Tue, 10 Dec 2013 23:22:40 GMT
Updated Branches:
  refs/heads/master 93ba232ee -> a9258ae80


Volumes page: Hide add/upload action if instance selected, to reduce confusion.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a9258ae8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a9258ae8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a9258ae8

Branch: refs/heads/master
Commit: a9258ae807b2be564fd82b95ddcb61cd02d7a294
Parents: 248195f
Author: Brian Federle <brian.federle@citrix.com>
Authored: Tue Dec 10 15:20:33 2013 -0800
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Tue Dec 10 15:20:39 2013 -0800

----------------------------------------------------------------------
 ui/scripts/storage.js | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a9258ae8/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index de929b3..86f7aa0 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -70,6 +70,10 @@
                         add: {
                             label: 'label.add.volume',
 
+                            preFilter: function(args) {
+                                return !args.context.instances;
+                            },
+
                             messages: {
                                 confirm: function(args) {
                                     return 'message.add.volume';
@@ -252,6 +256,9 @@
                         uploadVolume: {
                             isHeader: true,
                             label: 'label.upload.volume',
+                            preFilter: function(args) {
+                                return !args.context.instances;
+                            },
                             messages: {
                                 notification: function() {
                                     return 'label.upload.volume';


Mime
View raw message