js_upload: use empty string if no newalbum or album input element is found (#712)
This commit is contained in:
parent
77b7b73288
commit
6e4abdb875
|
@ -96,25 +96,31 @@ function createUploader() {
|
||||||
debug: true,
|
debug: true,
|
||||||
sizeLimit: $maximagesize,
|
sizeLimit: $maximagesize,
|
||||||
onSubmit: function(id,filename) {
|
onSubmit: function(id,filename) {
|
||||||
if (typeof acl!="undefined"){
|
var newalbumElm = document.getElementById('photos-upload-newalbum');
|
||||||
|
var albumElm = document.getElementById('photos-upload-album-select');
|
||||||
|
|
||||||
|
var newalbum = newalbumElm ? newalbumElm.value : "";
|
||||||
|
var album = albumElm ? albumElm.value : "";
|
||||||
|
|
||||||
|
if (typeof acl != "undefined"){
|
||||||
uploader.setParams( {
|
uploader.setParams( {
|
||||||
newalbum : document.getElementById('photos-upload-newalbum').value,
|
newalbum : newalbum,
|
||||||
album : document.getElementById('photos-upload-album-select').value,
|
album : album,
|
||||||
not_visible : document.getElementById('photos-upload-noshare').checked,
|
not_visible : document.getElementById('photos-upload-noshare').checked,
|
||||||
group_allow : acl.allow_gid.join(','),
|
group_allow : acl.allow_gid.join(','),
|
||||||
contact_allow : acl.allow_cid.join(','),
|
contact_allow : acl.allow_cid.join(','),
|
||||||
group_deny : acl.deny_gid.join(','),
|
group_deny : acl.deny_gid.join(','),
|
||||||
contact_deny : acl.deny_cid.join(',')
|
contact_deny : acl.deny_cid.join(',')
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
uploader.setParams( {
|
uploader.setParams( {
|
||||||
newalbum : document.getElementById('photos-upload-newalbum').value,
|
newalbum : newalbum,
|
||||||
album : document.getElementById('photos-upload-album-select').value,
|
album : album,
|
||||||
not_visible : document.getElementById('photos-upload-noshare').checked,
|
not_visible : document.getElementById('photos-upload-noshare').checked,
|
||||||
group_allow : getSelected(document.getElementById('group_allow')).join(','),
|
group_allow : getSelected(document.getElementById('group_allow')).join(','),
|
||||||
contact_allow : getSelected(document.getElementById('contact_allow')).join(','),
|
contact_allow : getSelected(document.getElementById('contact_allow')).join(','),
|
||||||
group_deny : getSelected(document.getElementById('group_deny')).join(','),
|
group_deny : getSelected(document.getElementById('group_deny')).join(','),
|
||||||
contact_deny : getSelected(document.getElementById('contact_deny')).join(',')
|
contact_deny : getSelected(document.getElementById('contact_deny')).join(',')
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user