[Pkg-owncloud-commits] [owncloud] 95/223: AllowUserMount defaults now to all backends fixes #7958

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 86e1d8ca54e9cbc3c33621f15abcf22fc3dcbec9
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Fri Jun 13 18:14:41 2014 +0200

    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 01dd5ae..ea0b70e 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 00793a6..2908177 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');
+
+		}
 	});
 });
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git