From 86e1d8ca54e9cbc3c33621f15abcf22fc3dcbec9 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 13 Jun 2014 18:14:41 +0200 Subject: [PATCH 1/3] AllowUserMount defaults now to all backends fixes #7958 --- apps/files_external/css/settings.css | 4 ++++ apps/files_external/js/settings.js | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css index 01dd5aece8..ea0b70ea59 100644 --- a/apps/files_external/css/settings.css +++ b/apps/files_external/css/settings.css @@ -25,3 +25,7 @@ tr:hover>td.remove>img { visibility:visible; cursor:pointer; } #externalStorage td.status .success { border-radius: 50%; } + +#userMountingBackups { + padding-left: 25px; +} diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index 00793a614c..29081772d6 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -310,7 +310,9 @@ $(document).ready(function() { OC.msg.startSaving('#userMountingMsg'); if (this.checked) { OC.AppConfig.setValue('files_external', 'allow_user_mounting', 'yes'); + $('input[name="allowUserMountingBackends\\[\\]"]').prop('checked', true); $('#userMountingBackups').removeClass('hidden'); + $($('input[name="allowUserMountingBackends\\[\\]"]')[0]).trigger('change'); } else { OC.AppConfig.setValue('files_external', 'allow_user_mounting', 'no'); $('#userMountingBackups').addClass('hidden'); @@ -323,6 +325,13 @@ $(document).ready(function() { var user_mounting_backends = $('input[name="allowUserMountingBackends\\[\\]"]:checked').map(function(){return $(this).val();}).get(); OC.AppConfig.setValue('files_external', 'user_mounting_backends', user_mounting_backends.join()); OC.msg.finishedSaving('#userMountingMsg', {status: 'success', data: {message: t('settings', 'Saved')}}); + + // disable allowUserMounting + if(user_mounting_backends.length === 0) { + $('#allowUserMounting').prop('checked', false); + $('#allowUserMounting').trigger('change'); + + } }); }); From 78b6f595232096a514f7f40281d53ec7aabc772a Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 16 Jun 2014 11:33:51 +0200 Subject: [PATCH 2/3] fix typo - Backups -> Backends --- apps/files_external/css/settings.css | 2 +- apps/files_external/js/settings.js | 4 ++-- apps/files_external/templates/settings.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css index ea0b70ea59..758c52ae85 100644 --- a/apps/files_external/css/settings.css +++ b/apps/files_external/css/settings.css @@ -26,6 +26,6 @@ tr:hover>td.remove>img { visibility:visible; cursor:pointer; } border-radius: 50%; } -#userMountingBackups { +#userMountingBackends { padding-left: 25px; } diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index 29081772d6..e5cb373a5b 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -311,11 +311,11 @@ $(document).ready(function() { if (this.checked) { OC.AppConfig.setValue('files_external', 'allow_user_mounting', 'yes'); $('input[name="allowUserMountingBackends\\[\\]"]').prop('checked', true); - $('#userMountingBackups').removeClass('hidden'); + $('#userMountingBackends').removeClass('hidden'); $($('input[name="allowUserMountingBackends\\[\\]"]')[0]).trigger('change'); } else { OC.AppConfig.setValue('files_external', 'allow_user_mounting', 'no'); - $('#userMountingBackups').addClass('hidden'); + $('#userMountingBackends').addClass('hidden'); } OC.msg.finishedSaving('#userMountingMsg', {status: 'success', data: {message: t('settings', 'Saved')}}); }); diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index df80ed1099..98fcf4a0ed 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -131,7 +131,7 @@ value="1" /> -

class="hidden"> +

class="hidden"> t('Allow users to mount the following external storage')); ?>
$backend): ?> /> From 0a2c676cda48aee0a9e788cae5fafeee5bdf0dec Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 16 Jun 2014 11:35:48 +0200 Subject: [PATCH 3/3] fix camelCase and avoiud re-wrapping $() --- apps/files_external/js/settings.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index e5cb373a5b..348fecf064 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -312,7 +312,7 @@ $(document).ready(function() { OC.AppConfig.setValue('files_external', 'allow_user_mounting', 'yes'); $('input[name="allowUserMountingBackends\\[\\]"]').prop('checked', true); $('#userMountingBackends').removeClass('hidden'); - $($('input[name="allowUserMountingBackends\\[\\]"]')[0]).trigger('change'); + $('input[name="allowUserMountingBackends\\[\\]"]').eq(0).trigger('change'); } else { OC.AppConfig.setValue('files_external', 'allow_user_mounting', 'no'); $('#userMountingBackends').addClass('hidden'); @@ -322,12 +322,12 @@ $(document).ready(function() { $('input[name="allowUserMountingBackends\\[\\]"]').bind('change', function() { OC.msg.startSaving('#userMountingMsg'); - var user_mounting_backends = $('input[name="allowUserMountingBackends\\[\\]"]:checked').map(function(){return $(this).val();}).get(); - OC.AppConfig.setValue('files_external', 'user_mounting_backends', user_mounting_backends.join()); + var userMountingBackends = $('input[name="allowUserMountingBackends\\[\\]"]:checked').map(function(){return $(this).val();}).get(); + OC.AppConfig.setValue('files_external', 'user_mounting_backends', userMountingBackends.join()); OC.msg.finishedSaving('#userMountingMsg', {status: 'success', data: {message: t('settings', 'Saved')}}); // disable allowUserMounting - if(user_mounting_backends.length === 0) { + if(userMountingBackends.length === 0) { $('#allowUserMounting').prop('checked', false); $('#allowUserMounting').trigger('change');