cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/4.5 to 635abaf
Date Mon, 17 Nov 2014 21:05:44 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 5f9991799 -> 635abaf2e


CLOUDSTACK-7927: UI > Infrastructure > Primary Storage > detailView > add "View
Volumes" link that will list all volumes under this primary storage when being clicked.


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

Branch: refs/heads/4.5
Commit: 635abaf2e9ca4f0399085f441ea6d5eeaab9f3ab
Parents: 5f99917
Author: Jessica Wang <jessicawang@apache.org>
Authored: Mon Nov 17 13:05:08 2014 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Mon Nov 17 13:05:08 2014 -0800

----------------------------------------------------------------------
 ui/scripts/storage.js | 7 ++++++-
 ui/scripts/system.js  | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/635abaf2/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 90720ac..12b77f0 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -477,7 +477,12 @@
                                 $.extend(data, {
                                     virtualMachineId: args.context.instances[0].id
                                 });
-                            }
+                            }                           
+                            if ("primarystorages" in args.context) {
+                                $.extend(data, {
+                                	storageid: args.context.primarystorages[0].id
+                                });
+                            }                           
                         }
 
                         $.ajax({

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/635abaf2/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 7b25c81..1029254 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -17398,6 +17398,10 @@
                     
                     detailView: {
                         name: "Primary storage details",
+                        viewAll: {
+                            label: 'label.volumes',
+                            path: 'storage.volumes'
+                        },
                         isMaximized: true,
                         actions: {
                             edit: {


Mime
View raw message