diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-06-12 20:53:45 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-06-12 20:53:45 +0200 |
| commit | 27fcdb3af5d1b1012695a09e04c0a654a1dde710 (patch) | |
| tree | 6de492454c862852de3f51bd8834e2012139b5ac /apps/files_external/js/settings.js | |
| parent | 46e5e9bd73a68f7b50bb79f883a8bc6efacaca97 (diff) | |
| parent | 3584d48d65900b15dc3ef6831926f4a52e508625 (diff) | |
| download | nextcloud-server-27fcdb3af5d1b1012695a09e04c0a654a1dde710.tar.gz nextcloud-server-27fcdb3af5d1b1012695a09e04c0a654a1dde710.zip | |
Merge branch 'master' into files_encryption_upgrade_fix
Conflicts:
apps/files_encryption/tests/crypt.php
Diffstat (limited to 'apps/files_external/js/settings.js')
| -rw-r--r-- | apps/files_external/js/settings.js | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index ac408786ff6..3e605c59a93 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -88,7 +88,7 @@ OC.MountConfig={ url: OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), data: { mountPoint: mountPoint, - class: backendClass, + 'class': backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, @@ -103,7 +103,7 @@ OC.MountConfig={ url: OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), data: { mountPoint: mountPoint, - class: backendClass, + 'class': backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, @@ -247,15 +247,18 @@ $(document).ready(function() { OC.MountConfig.saveStorage($(this).parent().parent()); }); + $('#sslCertificate').on('click', 'td.remove>img', function() { + var $tr = $(this).parent().parent(); + var row = this.parentNode.parentNode; + $.post(OC.filePath('files_external', 'ajax', 'removeRootCertificate.php'), {cert: row.id}); + $tr.remove(); + return true; + }); + $('#externalStorage').on('click', 'td.remove>img', function() { var tr = $(this).parent().parent(); var mountPoint = $(tr).find('.mountPoint input').val(); - if ( ! mountPoint) { - var row=this.parentNode.parentNode; - $.post(OC.filePath('files_external', 'ajax', 'removeRootCertificate.php'), { cert: row.id }); - $(tr).remove(); - return true; - } + if ($('#externalStorage').data('admin') === true) { var isPersonal = false; var multiselect = $(tr).find('.chzn-select').val(); |