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

Merge pull request #10339 from owncloud/users-defaultquotafix

Browse source 
Fixed default quota field on user management page
This commit is contained in:
Vincent Petry 2014-08-18 18:50:43 +02:00
commit a820df71ee
5 changed files with 125 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
core/js/apps.js
View file

@ -10,67 +10,78 @@
(function (document, $, exports) {
'use strict';
'use strict';
var dynamicSlideToggleEnabled = false;
var dynamicSlideToggleEnabled = false;
exports.Apps = {
enableDynamicSlideToggle: function () {
dynamicSlideToggleEnabled = true;
}
};
exports.Apps = {
enableDynamicSlideToggle: function () {
dynamicSlideToggleEnabled = true;
}
};
/**
* Provides a way to slide down a target area through a button and slide it
* up if the user clicks somewhere else. Used for the news app settings and
* add new field.
*
* Usage:
* <button data-apps-slide-toggle=".slide-area">slide</button>
* <div class=".slide-area" class="hidden">I'm sliding up</div>
*/
var registerAppsSlideToggle = function () {
var buttons = $('[data-apps-slide-toggle]');
/**
* Provides a way to slide down a target area through a button and slide it
* up if the user clicks somewhere else. Used for the news app settings and
* add new field.
*
* Usage:
* <button data-apps-slide-toggle=".slide-area">slide</button>
* <div class=".slide-area" class="hidden">I'm sliding up</div>
*/
var registerAppsSlideToggle = function () {
var buttons = $('[data-apps-slide-toggle]');
$(document).click(function (event) {
$(document).click(function (event) {
if (dynamicSlideToggleEnabled) {
buttons = $('[data-apps-slide-toggle]');
}
if (dynamicSlideToggleEnabled) {
buttons = $('[data-apps-slide-toggle]');
}
buttons.each(function (index, button) {
buttons.each(function (index, button) {
var areaSelector = $(button).data('apps-slide-toggle');
var area = $(areaSelector);
var areaSelector = $(button).data('apps-slide-toggle');
var area = $(areaSelector);
// do nothing if the area is animated
if (!area.is(':animated')) {
function hideArea() {
area.slideUp(function() {
area.trigger(new $.Event('hide'));
});
}
function showArea() {
area.slideDown(function() {
area.trigger(new $.Event('show'));
});
}
// button toggles the area
if (button === event.target) {
if (area.is(':visible')) {
area.slideUp();
} else {
area.slideDown();
}
// do nothing if the area is animated
if (!area.is(':animated')) {
// all other areas that have not been clicked but are open
// should be slid up
} else {
var closest = $(event.target).closest(areaSelector);
if (area.is(':visible') && closest[0] !== area[0]) {
area.slideUp();
}
}
}
});
// button toggles the area
if (button === event.target) {
if (area.is(':visible')) {
hideArea();
} else {
showArea();
}
});
};
// all other areas that have not been clicked but are open
// should be slid up
} else {
var closest = $(event.target).closest(areaSelector);
if (area.is(':visible') && closest[0] !== area[0]) {
hideArea();
}
}
}
});
});
};
$(document).ready(function () {
registerAppsSlideToggle();
});
$(document).ready(function () {
registerAppsSlideToggle();
});
}(document, jQuery, OC));
}(document, jQuery, OC));

10
core/js/singleselect.js
View file

@ -2,10 +2,14 @@
$.fn.singleSelect = function () {
return this.each(function (i, select) {
var input = $('<input/>'),
gravity = $(select).attr('data-tipsy-gravity'),
inputTooltip = $(select).attr('data-inputtitle');
if (inputTooltip){
input.attr('title', inputTooltip);
}
if (typeof gravity === 'undefined') {
gravity = 'n'
}
select = $(select);
input.css('position', 'absolute');
input.css({
@ -35,7 +39,7 @@
input.css(select.offset());
input.show();
if ($.fn.tipsy){
input.tipsy({gravity: 'n', trigger: 'manual'});
input.tipsy({gravity: gravity, trigger: 'manual'});
input.tipsy('show');
}
select.css('background-color', 'white');
@ -83,6 +87,10 @@
$(this).tipsy('hide');
}
});
input.click(function(ev) {
// prevent clicks to close any container
ev.stopPropagation();
});
});
};
})(jQuery);

24
settings/js/users/groups.js
View file

@ -289,28 +289,4 @@ $(document).ready( function () {
$userGroupList.on('click', '.isgroup', function () {
GroupList.showGroup(GroupList.getElementGID(this));
});
// Implements Quota Settings Toggle.
var $appSettings = $('#app-settings');
$('#app-settings-header').on('click keydown',function(event) {
if(wrongKey(event)) {
return;
}
if($appSettings.hasClass('open')) {
$appSettings.switchClass('open', '');
} else {
$appSettings.switchClass('', 'open');
}
});
$('body').on('click', function(event){
if($appSettings.find(event.target).length === 0) {
$appSettings.switchClass('open', '');
}
});
});
var wrongKey = function(event) {
return ((event.type === 'keydown' || event.type === 'keypress') &&
(event.keyCode !== 32 && event.keyCode !== 13));
};

82
settings/js/users/users.js
View file

@ -18,6 +18,18 @@ var UserList = {
usersToLoad: 10, //So many users will be loaded when user scrolls down
currentGid: '',
/**
* Initializes the user list
* @param $el user list table element
*/
initialize: function($el) {
this.$el = $el;
// initially the list might already contain user entries (not fully ajaxified yet)
// initialize these entries
this.$el.find('.quota-user').singleSelect().on('change', this.onQuotaSelect);
},
add: function (username, displayname, groups, subadmin, quota, storageLocation, lastLogin, sort) {
var $tr = $userListBody.find('tr:first-child').clone();
var subAdminsEl;
@ -109,15 +121,7 @@ var UserList = {
UserList.doSort();
}
$quotaSelect.on('change', function () {
var uid = UserList.getUID(this);
var quota = $(this).val();
setQuota(uid, quota, function(returnedQuota){
if (quota !== returnedQuota) {
$($quotaSelect).find(':selected').text(returnedQuota);
}
});
});
$quotaSelect.on('change', UserList.onQuotaSelect);
// defer init so the user first sees the list appear more quickly
window.setTimeout(function(){
@ -496,21 +500,42 @@ var UserList = {
if (UserList.scrollArea.scrollTop() + UserList.scrollArea.height() > UserList.scrollArea.get(0).scrollHeight - 500) {
UserList.update(UserList.currentGid, true);
}
},
/**
* Event handler for when a quota has been changed through a single select.
* This will save the value.
*/
onQuotaSelect: function(ev) {
var $select = $(ev.target);
var uid = UserList.getUID($select);
var quota = $select.val();
UserList._updateQuota(uid, quota, function(returnedQuota){
if (quota !== returnedQuota) {
$select.find(':selected').text(returnedQuota);
}
});
},
/**
* Saves the quota for the given user
* @param {String} [uid] optional user id, sets default quota if empty
* @param {String} quota quota value
* @param {Function} ready callback after save
*/
_updateQuota: function(uid, quota, ready) {
$.post(
OC.filePath('settings', 'ajax', 'setquota.php'),
{username: uid, quota: quota},
function (result) {
if (ready) {
ready(result.data.quota);
}
}
);
}
};
function setQuota (uid, quota, ready) {
$.post(
OC.filePath('settings', 'ajax', 'setquota.php'),
{username: uid, quota: quota},
function (result) {
if (ready) {
ready(result.data.quota);
}
}
);
}
$(document).ready(function () {
$userList = $('#userlist');
$userListBody = $userList.find('tbody');
@ -528,6 +553,9 @@ $(document).ready(function () {
$userList.after($('<div class="loading" style="height: 200px; visibility: hidden;"></div>'));
// TODO: move other init calls inside of initialize
UserList.initialize($('#userlist'));
$('.groupsselect').each(function (index, element) {
UserList.applyGroupSelect(element);
});
@ -611,15 +639,9 @@ $(document).ready(function () {
});
});
$('#default_quota, .quota-user').singleSelect().on('change', function () {
var $select = $(this);
var uid = UserList.getUID($select);
var quota = $select.val();
setQuota(uid, quota, function(returnedQuota){
if (quota !== returnedQuota) {
$select.find(':selected').text(returnedQuota);
}
});
// init the quota field select box after it is shown the first time
$('#app-settings').one('show', function() {
$(this).find('#default_quota').singleSelect().on('change', UserList.onQuotaSelect);
});
$('#newuser').submit(function (event) {

6
settings/templates/users/part.setquota.php
View file

@ -1,12 +1,12 @@
<div id="app-settings-header">
<button class="settings-button" tabindex="0"></button>
<button class="settings-button" tabindex="0" data-apps-slide-toggle="#app-settings-content"></button>
</div>
<div id="app-settings-content">
<div class="quota">
<!-- Default storage -->
<span><?php p($l->t('Default Quota'));?></span>
<?php if((bool) $_['isAdmin']): ?>
<select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
<select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>" data-tipsy-gravity="s">
<option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'>
<?php p($l->t('Unlimited'));?>
</option>
@ -36,4 +36,4 @@
</select>
<?php endif; ?>
</div>
</div>
</div>