You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2013/02/21 23:06:19 UTC

git commit: refs/heads/ui-primary-storage-target - zone wide primary storage server side changes

Updated Branches:
  refs/heads/ui-primary-storage-target 6ef7928a9 -> 31c26beb7


zone wide primary storage server side changes


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

Branch: refs/heads/ui-primary-storage-target
Commit: 31c26beb7f29c57012b22920014f5b18ef62f83f
Parents: 6ef7928
Author: Pranav Saxena <pr...@citrix.com>
Authored: Fri Feb 22 03:28:01 2013 +0530
Committer: Pranav Saxena <pr...@citrix.com>
Committed: Fri Feb 22 03:28:01 2013 +0530

----------------------------------------------------------------------
 ui/scripts/system.js |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/31c26beb/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 375d777..997bd53 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -8654,7 +8654,8 @@
             name: { label: 'label.name' },
             ipaddress: { label: 'label.server' },
 						path: { label: 'label.path' },
-						clustername: { label: 'label.cluster'}
+						clustername: { label: 'label.cluster'},
+            scope:{label:'Scope'}
           },
 
           dataProvider: function(args) {
@@ -9218,9 +9219,24 @@
 
               action: function(args) {
                 var array1 = [];
+                array1.push("&scope=" + todb(args.data.scope));
+
                 array1.push("&zoneid=" + args.data.zoneid);
-                array1.push("&podId=" + args.data.podId);
+            
+               if(args.data.scope == 'cluster'){
+
+                array1.push("&podid=" + args.data.podId);
+                array1.push("&clusterid=" + args.data.clusterId);
+
+               }
+
+                if(args.data.scope == 'host'){
+                array1.push("&podid=" + args.data.podId);
                 array1.push("&clusterid=" + args.data.clusterId);
+                array1.push("&hostid=" + args.data.hostId);
+
+               }
+
                 array1.push("&name=" + todb(args.data.name));
 
                 var server = args.data.server;