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/master to 3e2eb59
Date Fri, 26 Apr 2013 18:28:25 GMT
Updated Branches:
  refs/heads/master 7cf312a77 -> 3e2eb5972


CLOUDSTACK-2120: mixed zone management - UI: make global function changeURL() to pass zonetype
to API calls based on selected option in zone type dropdown on top menu.


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

Branch: refs/heads/master
Commit: 3e2eb59723f6aa58170e8650ca8ef03a8b2d6b45
Parents: 7cf312a
Author: Jessica Wang <jessicawang@apache.org>
Authored: Fri Apr 26 11:26:21 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Fri Apr 26 11:26:21 2013 -0700

----------------------------------------------------------------------
 ui/scripts/sharedFunctions.js |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e2eb597/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 7467531..a018406 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -114,6 +114,10 @@ function createURL(apiName, options) {
   if (cloudStack.context && cloudStack.context.projects && !options.ignoreProject)
{
     urlString = urlString + '&projectid=' + cloudStack.context.projects[0].id;
   }
+    
+  if(cloudStack.context != null && cloudStack.context.zoneType != null &&
cloudStack.context.zoneType.length > 0) { //Basic type or Advanced type
+    urlString = urlString + '&zonetype=' + cloudStack.context.zoneType;    
+  }    
   
   return urlString;
 }


Mime
View raw message