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- S3 - not pass details[i] info when corresponding field is empty.

This commit is contained in:
Jessica Wang 2013-05-16 13:04:00 -07:00
parent c476d7866e
commit d5ab59614a
1 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
ui/scripts/system.js
View File

@ -11186,27 +11186,43 @@
});
}
else if(args.data.provider == 'S3') {
var data = {
provider: args.data.provider,
'details[0].key': 'accesskey',
'details[0].value': args.data.accesskey,
'details[1].key': 'secretkey',
'details[1].value': args.data.secretkey,
'details[2].key': 'bucket',
'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';
data['details[' + index.toString() + '].value'] = args.data.endpoint;
index++;
}
if(args.data.connectiontimeout != null && args.data.connectiontimeout.length > 0){
data['details[' + index.toString() + '].key'] = 'connectiontimeout';
data['details[' + index.toString() + '].value'] = args.data.connectiontimeout;
index++;
}
if(args.data.maxerrorretry != null && args.data.maxerrorretry.length > 0){
data['details[' + index.toString() + '].key'] = 'maxerrorretry';
data['details[' + index.toString() + '].value'] = args.data.maxerrorretry;
index++;
}
if(args.data.sockettimeout != null && args.data.sockettimeout.length > 0){
data['details[' + index.toString() + '].key'] = 'sockettimeout';
data['details[' + index.toString() + '].value'] = args.data.sockettimeout;
index++;
}
$.ajax({
url: createURL('addImageStore'),
data: {
provider: args.data.provider,
'details[0].key': 'accesskey',
'details[0].value': args.data.accesskey,
'details[1].key': 'secretkey',
'details[1].value': args.data.secretkey,
'details[2].key': 'bucket',
'details[2].value': args.data.bucket,
'details[3].key': 'endpoint',
'details[3].value': args.data.endpoint,
'details[4].key': 'usehttps',
'details[4].value': (args.data.usehttps != null && args.data.usehttps == 'on' ? 'true' : 'false'),
'details[5].key': 'connectiontimeout',
'details[5].value': args.data.connectiontimeout,
'details[6].key': 'maxerrorretry',
'details[6].value': args.data.maxerrorretry,
'details[7].key': 'sockettimeout',
'details[7].value': args.data.sockettimeout
},
data: data,
success: function(json) {
havingS3 = true;
var item = json.addimagestoreresponse.secondarystorage;