diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-03-31 15:07:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-31 15:07:39 +0200 |
| commit | 57020a0c3633639eff943976cf1cc978efbb344c (patch) | |
| tree | 298ef40bb8bb38102ae47176921d2a9d1d5cee45 | |
| parent | 85da9378c0a46840b53d7c90bb88996bd62e7677 (diff) | |
| parent | 76d8699c0f3678ee77879831229832557b7f0ec8 (diff) | |
| download | nextcloud-server-57020a0c3633639eff943976cf1cc978efbb344c.tar.gz nextcloud-server-57020a0c3633639eff943976cf1cc978efbb344c.zip | |
Merge pull request #3438 from nextcloud/external-storage-user-folder
Allow using '/' as external storage mountpoint
| -rw-r--r-- | apps/files_external/js/settings.js | 2 | ||||
| -rw-r--r-- | apps/files_external/lib/Controller/StoragesController.php | 2 |
2 files changed, 2 insertions, 2 deletions
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') |