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/06/21 00:35:24 UTC
[2/2] git commit: updated refs/heads/master-6-17-stable to 08cee8b
CLOUDSTACK-3045: Fix missing 'array2' from add cluster/add host
Conflicts:
ui/scripts/system.js
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9ad12469
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9ad12469
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9ad12469
Branch: refs/heads/master-6-17-stable
Commit: 9ad12469bf0801882be79b751bbe936cde72d55b
Parents: b10f109
Author: Brian Federle <br...@citrix.com>
Authored: Thu Jun 20 15:31:39 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Jun 20 15:35:19 2013 -0700
----------------------------------------------------------------------
ui/scripts/system.js | 37 ++++++++++++++++++-------------------
1 file changed, 18 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9ad12469/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 1e964ea..cd7af12 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -9766,9 +9766,9 @@
var item = json.addclusterresponse.cluster[0];
clusterId= json.addclusterresponse.cluster[0].id;
- //EXPLICIT DEDICATION
- if(args.$form.find('.form-item[rel=isDedicated]').find('input[type=checkbox]').is(':Checked')== true){
- var array2 = [];
+ //EXPLICIT DEDICATION
+ var array2 = [];
+ if(args.$form.find('.form-item[rel=isDedicated]').find('input[type=checkbox]').is(':Checked')== true){
if(args.data.accountId != "")
array2.push("&account=" +todb(args.data.accountId));
}
@@ -9790,7 +9790,7 @@
data:$.extend(item, {state:'Enabled'})
});
- },
+ },
error:function(json){
args.response.error(parseXMLHttpResponse(XMLHttpResponse));
@@ -9802,8 +9802,6 @@
var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
args.response.error(errorMsg);
}
-
-
});
},
@@ -10865,12 +10863,13 @@
data: data,
success: function(json) {
var item = json.addhostresponse.host[0];
+
hostId = json.addhostresponse.host[0].id;
+ //EXPLICIT DEDICATION
+ var array2 = [];
- //EXPLICIT DEDICATION
- if(args.$form.find('.form-item[rel=isDedicated]').find('input[type=checkbox]').is(':Checked')== true){
- var array2 = [];
+ if(args.$form.find('.form-item[rel=isDedicated]').find('input[type=checkbox]').is(':Checked')== true){
if(args.data.accountId != "")
array2.push("&account=" +todb(args.data.accountId));
}
@@ -10886,21 +10885,21 @@
{ jobId: jid
},
notification: {
- poll: pollAsyncJobResult
- },
+ poll: pollAsyncJobResult
+ },
- data:item
+ data:item
});
},
-
- error:function(json){
- args.response.error(parseXMLHttpResponse(XMLHttpResponse));
- }
- });
- }
- },
+
+ error:function(json){
+ args.response.error(parseXMLHttpResponse(XMLHttpResponse));
+ }
+ });
+ }
+ },
error: function(XMLHttpResponse) {
var errorMsg = parseXMLHttpResponse(XMLHttpResponse);