summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2013-06-12 10:30:54 +0200
committerBjörn Schießle <schiessle@owncloud.com>2013-06-12 10:30:54 +0200
commit506c9de5cd44eddc89402950a734564451b2fbcd (patch)
tree632e4974c78725bb179c7d1b5e51ee156bd02f9d
parentd2773982d588868ecddea8d63aa07d14045f177d (diff)
downloadnextcloud-server-506c9de5cd44eddc89402950a734564451b2fbcd.tar.gz
nextcloud-server-506c9de5cd44eddc89402950a734564451b2fbcd.zip
backport of https://github.com/owncloud/core/commit/1fa76e53dc5c515035f19e78f3988205521720f6
-rw-r--r--apps/files_external/js/settings.js19
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();