Skip to content

Commit 44adba0

Browse files
author
Jessica Wang
committed
CLOUDSTACK-2505: object_store - UI - zone wizard - add secondary storage- S3, Swift - not pass details[i] info when corresponding field is empty.
1 parent 47aeda9 commit 44adba0

1 file changed

Lines changed: 55 additions & 30 deletions

File tree

‎ui/scripts/zoneWizard.js‎

Lines changed: 55 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3692,27 +3692,41 @@
36923692
});
36933693
}
36943694
else if(args.data.secondaryStorage.provider == 'S3') {
3695+
var data = {
3696+
provider: args.data.secondaryStorage.provider,
3697+
'details[0].key': 'accesskey',
3698+
'details[0].value': args.data.secondaryStorage.accesskey,
3699+
'details[1].key': 'secretkey',
3700+
'details[1].value': args.data.secondaryStorage.secretkey,
3701+
'details[2].key': 'bucket',
3702+
'details[2].value': args.data.secondaryStorage.bucket,
3703+
'details[3].key': 'usehttps',
3704+
'details[3].value': (args.data.secondaryStorage.usehttps != null && args.data.secondaryStorage.usehttps == 'on' ? 'true' : 'false')
3705+
};
3706+
var index = 4;
3707+
if(args.data.secondaryStorage.endpoint != null && args.data.secondaryStorage.endpoint.length > 0){
3708+
data['details[' + index.toString() + '].key'] = 'endpoint';
3709+
data['details[' + index.toString() + '].value'] = args.data.secondaryStorage.endpoint;
3710+
index++;
3711+
}
3712+
if(args.data.secondaryStorage.connectiontimeout != null && args.data.secondaryStorage.connectiontimeout.length > 0){
3713+
data['details[' + index.toString() + '].key'] = 'connectiontimeout';
3714+
data['details[' + index.toString() + '].value'] = args.data.secondaryStorage.connectiontimeout;
3715+
index++;
3716+
}
3717+
if(args.data.secondaryStorage.maxerrorretry != null && args.data.secondaryStorage.maxerrorretry.length > 0){
3718+
data['details[' + index.toString() + '].key'] = 'maxerrorretry';
3719+
data['details[' + index.toString() + '].value'] = args.data.secondaryStorage.maxerrorretry;
3720+
index++;
3721+
}
3722+
if(args.data.secondaryStorage.sockettimeout != null && args.data.secondaryStorage.sockettimeout.length > 0){
3723+
data['details[' + index.toString() + '].key'] = 'sockettimeout';
3724+
data['details[' + index.toString() + '].value'] = args.data.secondaryStorage.sockettimeout;
3725+
index++;
3726+
}
36953727
$.ajax({
36963728
url: createURL('addImageStore'),
3697-
data: {
3698-
provider: args.data.secondaryStorage.provider,
3699-
'details[0].key': 'accesskey',
3700-
'details[0].value': args.data.secondaryStorage.accesskey,
3701-
'details[1].key': 'secretkey',
3702-
'details[1].value': args.data.secondaryStorage.secretkey,
3703-
'details[2].key': 'bucket',
3704-
'details[2].value': args.data.secondaryStorage.bucket,
3705-
'details[3].key': 'endpoint',
3706-
'details[3].value': args.data.secondaryStorage.endpoint,
3707-
'details[4].key': 'usehttps',
3708-
'details[4].value': (args.data.secondaryStorage.usehttps != null && args.data.secondaryStorage.usehttps == 'on' ? 'true' : 'false'),
3709-
'details[5].key': 'connectiontimeout',
3710-
'details[5].value': args.data.secondaryStorage.connectiontimeout,
3711-
'details[6].key': 'maxerrorretry',
3712-
'details[6].value': args.data.secondaryStorage.maxerrorretry,
3713-
'details[7].key': 'sockettimeout',
3714-
'details[7].value': args.data.secondaryStorage.sockettimeout
3715-
},
3729+
data: data,
37163730
success: function(json) {
37173731
complete({
37183732
data: $.extend(args.data, {
@@ -3751,19 +3765,30 @@
37513765
});
37523766
}
37533767
}
3754-
else if(args.data.secondaryStorage.provider == 'Swift') {
3768+
else if(args.data.secondaryStorage.provider == 'Swift') {
3769+
var data = {
3770+
provider: args.data.secondaryStorage.provider,
3771+
url: args.data.secondaryStorage.url
3772+
};
3773+
var index = 0;
3774+
if(args.data.secondaryStorage.account != null && args.data.secondaryStorage.account.length > 0){
3775+
data['details[' + index.toString() + '].key'] = 'account';
3776+
data['details[' + index.toString() + '].value'] = args.data.secondaryStorage.account;
3777+
index++;
3778+
}
3779+
if(args.data.secondaryStorage.username != null && args.data.secondaryStorage.username.length > 0){
3780+
data['details[' + index.toString() + '].key'] = 'username';
3781+
data['details[' + index.toString() + '].value'] = args.data.secondaryStorage.username;
3782+
index++;
3783+
}
3784+
if(args.data.secondaryStorage.key != null && args.data.secondaryStorage.key.length > 0){
3785+
data['details[' + index.toString() + '].key'] = 'key';
3786+
data['details[' + index.toString() + '].value'] = args.data.secondaryStorage.key;
3787+
index++;
3788+
}
37553789
$.ajax({
37563790
url: createURL('addImageStore'),
3757-
data: {
3758-
provider: args.data.secondaryStorage.provider,
3759-
url: args.data.secondaryStorage.url,
3760-
'details[0].key': 'account',
3761-
'details[0].value': args.data.secondaryStorage.account,
3762-
'details[1].key': 'username',
3763-
'details[1].value': args.data.secondaryStorage.username,
3764-
'details[2].key': 'key',
3765-
'details[2].value': args.data.secondaryStorage.key
3766-
},
3791+
data: data,
37673792
success: function(json) {
37683793
complete({
37693794
data: $.extend(args.data, {

0 commit comments

Comments
 (0)