mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3438 from nextcloud/external-storage-user-folder 

Allow using '/' as external storage mountpoint
This commit is contained in:
Roeland Jago Douma 2017-03-31 15:07:39 +02:00 committed by GitHub
parent 85da9378c0 76d8699c0f
commit 57020a0c36
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_external/js/settings.js
View File

@ -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);

2
apps/files_external/lib/Controller/StoragesController.php
View File

@ -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')