From: Robin Appelman <robin@icewind.nl>
Date: Fri, 10 Feb 2017 12:29:18 +0000 (+0100)
Subject: Allow using '/' as external storage root
X-Git-Tag: v12.0.0beta1~245^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=76d8699c0f3678ee77879831229832557b7f0ec8;p=nextcloud-server.git

Allow using '/' as external storage root

Signed-off-by: Robin Appelman <robin@icewind.nl>
---

diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 976c0c00b89..4e35ea531eb 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -960,7 +960,7 @@ MountConfigListView.prototype = _.extend({
 			success: function(result) {
 				var onCompletion = jQuery.Deferred();
 				$.each(result, function(i, storageParams) {
-					storageParams.mountPoint = storageParams.mountPoint.substr(1); // trim leading slash
+					storageParams.mountPoint = (storageParams.mountPoint === '/')? '/' : storageParams.mountPoint.substr(1); // trim leading slash
 					var storageConfig = new self._storageConfigClass();
 					_.extend(storageConfig, storageParams);
 					var $tr = self.newStorage(storageConfig, onCompletion);
diff --git a/apps/files_external/lib/Controller/StoragesController.php b/apps/files_external/lib/Controller/StoragesController.php
index ef7cc8c6e4f..d962848bd78 100644
--- a/apps/files_external/lib/Controller/StoragesController.php
+++ b/apps/files_external/lib/Controller/StoragesController.php
@@ -143,7 +143,7 @@ abstract class StoragesController extends Controller {
 	 */
 	protected function validate(StorageConfig $storage) {
 		$mountPoint = $storage->getMountPoint();
-		if ($mountPoint === '' || $mountPoint === '/') {
+		if ($mountPoint === '') {
 			return new DataResponse(
 				array(
 					'message' => (string)$this->l10n->t('Invalid mount point')