upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Fix "Other" value handling in quota dropdown in users page

Browse source 
Prevents "other" value to be deleted.
When appending custom value, put it above the "other" entry.
This commit is contained in:
Vincent Petry 2016-06-23 18:42:11 +02:00
parent cc2aec11af
commit 9092d7f5ea
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
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,9 @@ var UserList = {
var $select = $(ev.target);
var uid = UserList.getUID($select);
var quota = $select.val();
if (quota === 'other') {
return;
}
UserList._updateQuota(uid, quota, function(returnedQuota){
if (quota !== returnedQuota) {
$select.find(':selected').text(returnedQuota);