wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #25253 from owncloud/users-fixotherquotadropdown

Browse source 
Fix "Other" value handling in quota dropdown in users page
This commit is contained in:
Vincent Petry 2016-07-04 16:13:18 +02:00 committed by GitHub
commit a48df671a3
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
settings/js/users/users.js
View file

@ -138,10 +138,13 @@ var UserList = {
.find('option').attr('selected', null)
.first().attr('selected', 'selected');
} else {
if ($quotaSelect.find('option').filterAttr('value', user.quota).length > 0) {
$quotaSelect.find('option').filterAttr('value', user.quota).attr('selected', 'selected');
var $options = $quotaSelect.find('option');
var $foundOption = $options.filterAttr('value', user.quota);
if ($foundOption.length > 0) {
$foundOption.attr('selected', 'selected');
} else {
$quotaSelect.append('<option value="' + escapeHTML(user.quota) + '" selected="selected">' + escapeHTML(user.quota) + '</option>');
// append before "Other" entry
$options.last().before('<option value="' + escapeHTML(user.quota) + '" selected="selected">' + escapeHTML(user.quota) + '</option>');
}
}
@ -576,6 +579,15 @@ var UserList = {
var $select = $(ev.target);
var uid = UserList.getUID($select);
var quota = $select.val();
if (quota === 'other') {
return;
}
if (isNaN(parseInt(quota, 10)) || parseInt(quota, 10) < 0) {
// the select component has added the bogus value, delete it again
$select.find('option[selected]').remove();
OC.Notification.showTemporary(t('core', 'Invalid quota value "{val}"', {val: quota}));
return;
}
UserList._updateQuota(uid, quota, function(returnedQuota){
if (quota !== returnedQuota) {
$select.find(':selected').text(returnedQuota);