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/06/06 13:48:00 UTC
git commit: updated refs/heads/master to c0850d4
Updated Branches:
refs/heads/master 9889ead37 -> c0850d4d8
CLOUDSTACK-2873: Passing account name for explicit dedication
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c0850d4d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c0850d4d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c0850d4d
Branch: refs/heads/master
Commit: c0850d4d82dd291cf0aa24318e7dd40cc4532eec
Parents: 9889ead
Author: Pranav Saxena <pr...@citrix.com>
Authored: Thu Jun 6 17:14:57 2013 +0530
Committer: Pranav Saxena <pr...@citrix.com>
Committed: Thu Jun 6 17:14:57 2013 +0530
----------------------------------------------------------------------
ui/scripts/system.js | 14 +++++++-------
ui/scripts/zoneWizard.js | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0850d4d/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index bb197c4..c5019d7 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -5588,7 +5588,7 @@
//EXPLICIT DEDICATION
var array2 = [];
if(args.data.accountId != "")
- array2.push("&accountId=" +todb(args.data.accountId));
+ array2.push("&account=" +todb(args.data.accountId));
$.ajax({
url: createURL("dedicateZone&zoneId=" + args.context.physicalResources[0].id + "&domainId=" +args.data.domainId + array2.join("") ),
@@ -8823,7 +8823,7 @@
if(args.$form.find('.form-item[rel=isDedicated]').find('input[type=checkbox]').is(':Checked')== true){
var array2 = [];
if(args.data.accountId != "")
- array2.push("&accountId=" +todb(args.data.accountId));
+ array2.push("&account=" +todb(args.data.accountId));
if(podId != null){
$.ajax({
@@ -9008,7 +9008,7 @@
//EXPLICIT DEDICATION
var array2 = [];
if(args.data.accountId != "")
- array2.push("&accountId=" +todb(args.data.accountId));
+ array2.push("&account=" +todb(args.data.accountId));
$.ajax({
url: createURL("dedicatePod&podId=" + args.context.pods[0].id + "&domainId=" +args.data.domainId + array2.join("")),
@@ -9768,7 +9768,7 @@
if(args.$form.find('.form-item[rel=isDedicated]').find('input[type=checkbox]').is(':Checked')== true){
var array2 = [];
if(args.data.accountId != "")
- array2.push("&accountId=" +todb(args.data.accountId));
+ array2.push("&account=" +todb(args.data.accountId));
}
if(clusterId != null){
@@ -9989,7 +9989,7 @@
var array2 = [];
if(args.data.accountId != "")
- array2.push("&accountId=" +todb(args.data.accountId));
+ array2.push("&account=" +todb(args.data.accountId));
$.ajax({
url: createURL("dedicateCluster&clusterId=" + args.context.clusters[0].id + "&domainId=" +args.data.domainId + array2.join("") ),
@@ -10870,7 +10870,7 @@
if(args.$form.find('.form-item[rel=isDedicated]').find('input[type=checkbox]').is(':Checked')== true){
var array2 = [];
if(args.data.accountId != "")
- array2.push("&accountId=" +todb(args.data.accountId));
+ array2.push("&account=" +todb(args.data.accountId));
}
if(hostId != null){
@@ -11006,7 +11006,7 @@
//EXPLICIT DEDICATION
var array2 = [];
if(args.data.accountId != "")
- array2.push("&accountId=" +todb(args.data.accountId));
+ array2.push("&account=" +todb(args.data.accountId));
$.ajax({
url: createURL("dedicateHost&hostId=" + args.context.hosts[0].id + "&domainId=" +args.data.domainId + array2.join("") ),
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0850d4d/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 07558e3..6631cba 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -1628,7 +1628,7 @@
if(args.data.zone.domain != null)
array2.push("&domainid=" + args.data.zone.domain);
if(args.data.zone.accountId != "")
- array2.push("&accountId=" +todb(args.data.zone.accountId));
+ array2.push("&account=" +todb(args.data.zone.accountId));
if(dedicatedZoneId != null){
$.ajax({