etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-2505: object_store - UI - infrastructure menu - add secondary storage- Swift - not pass details[i] info when corresponding field is empty.

This commit is contained in:
Jessica Wang 2013-05-16 13:13:29 -07:00
parent d5ab59614a
commit 47aeda9893
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ui/scripts/system.js
View File

@ -11196,8 +11196,7 @@
'details[2].value': args.data.bucket,
'details[3].key': 'usehttps',
'details[3].value': (args.data.usehttps != null && args.data.usehttps == 'on' ? 'true' : 'false')
};
debugger;
};
var index = 4;
if(args.data.endpoint != null && args.data.endpoint.length > 0){
data['details[' + index.toString() + '].key'] = 'endpoint';
@ -11260,18 +11259,29 @@
}
}
else if(args.data.provider == 'Swift') {
var data = {
provider: args.data.provider,
url: args.data.url
};
var index = 0;
if(args.data.account != null && args.data.account.length > 0){
data['details[' + index.toString() + '].key'] = 'account';
data['details[' + index.toString() + '].value'] = args.data.account;
index++;
}
if(args.data.username != null && args.data.username.length > 0){
data['details[' + index.toString() + '].key'] = 'username';
data['details[' + index.toString() + '].value'] = args.data.username;
index++;
}
if(args.data.key != null && args.data.key.length > 0){
data['details[' + index.toString() + '].key'] = 'key';
data['details[' + index.toString() + '].value'] = args.data.key;
index++;
}
$.ajax({
url: createURL('addImageStore'),
data: {
provider: args.data.provider,
url: args.data.url,
'details[0].key': 'account',
'details[0].value': args.data.account,
'details[1].key': 'username',
'details[1].value': args.data.username,
'details[2].key': 'key',
'details[2].value': args.data.key
},
data: data,
success: function(json) {
havingSwift = true;
var item = json.addimagestoreresponse.secondarystorage;