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 2013/12/11 00:22:40 UTC
[1/2] git commit: updated refs/heads/master to a9258ae
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 <br...@citrix.com>
Authored: Tue Dec 10 15:20:33 2013 -0800
Committer: Brian Federle <br...@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';
[2/2] git commit: updated refs/heads/master to a9258ae
Posted by bf...@apache.org.
List view: Fix context not being passed correctly to header actions pre-filter
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/248195fc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/248195fc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/248195fc
Branch: refs/heads/master
Commit: 248195fcd78f9441cb8fa6984060fbde2d0c48d4
Parents: 93ba232
Author: Brian Federle <br...@citrix.com>
Authored: Tue Dec 10 15:19:45 2013 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Dec 10 15:20:39 2013 -0800
----------------------------------------------------------------------
ui/scripts/ui/widgets/listView.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/248195fc/ui/scripts/ui/widgets/listView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index 06b8521..d94744d 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -1701,7 +1701,7 @@
$.each(listViewData.actions, function(actionName, action) {
if (!action.isHeader || (
action.preFilter && !action.preFilter({
- context: listViewData.context ? listViewData.context : cloudStack.context
+ context: $listView.data('view-args').context ? $listView.data('view-args').context : cloudStack.context
})
)) return true;