diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-18 23:22:34 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-18 23:22:34 +0100 |
| commit | afb5de955e00490be5762247e817b20722091f37 (patch) | |
| tree | 035b826eacc5a21244c383075138731eaafeaebc /settings/js | |
| parent | 130c9cad030ca777e23ef70b76822553ea1c6411 (diff) | |
| parent | 31cc9aa80d4284e13dc95d2ef1428bed78c22d65 (diff) | |
| download | nextcloud-server-afb5de955e00490be5762247e817b20722091f37.tar.gz nextcloud-server-afb5de955e00490be5762247e817b20722091f37.zip | |
Merge branch 'master' into fixing-998-master
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
Diffstat (limited to 'settings/js')
| -rw-r--r-- | settings/js/admin.js | 4 | ||||
| -rw-r--r-- | settings/js/users.js | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/settings/js/admin.js b/settings/js/admin.js index 95b7a503c27..ab218377fb3 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -30,4 +30,8 @@ $(document).ready(function(){ } OC.AppConfig.setValue('core', $(this).attr('name'), value); }); + + $('#security').change(function(){ + $.post(OC.filePath('settings','ajax','setsecurity.php'), { enforceHTTPS: $('#enforceHTTPSEnabled').val() },function(){} ); + }); }); diff --git a/settings/js/users.js b/settings/js/users.js index 2ccb56ab0e3..9f0c1ffd111 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -176,9 +176,9 @@ var UserList = { } else { checkHandeler = false; } - var addGroup = function (group) { + var addGroup = function (select, group) { $('select[multiple]').each(function (index, element) { - if ($(element).find('option[value="' + group + '"]').length == 0) { + if ($(element).find('option[value="' + group + '"]').length === 0 && select.data('msid') !== $(element).data('msid')) { $(element).append('<option value="' + group + '">' + group + '</option>'); } }) @@ -192,6 +192,7 @@ var UserList = { element.multiSelect({ createCallback:addGroup, createText:label, + selectedFirst:true, checked:checked, oncheck:checkHandeler, onuncheck:checkHandeler, |