diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2020-01-10 12:11:26 +0100 |
|---|---|---|
| committer | Backportbot <backportbot-noreply@rullzer.com> | 2020-01-10 18:13:14 +0000 |
| commit | 5d2b892b37d2080957b0ba9c5cc38a85f7209976 (patch) | |
| tree | f1bb75194e08980cd6afb27753583580e6b6f471 | |
| parent | 3554a806c244eb716cb59d94041e9eca80dbf734 (diff) | |
| download | nextcloud-server-5d2b892b37d2080957b0ba9c5cc38a85f7209976.tar.gz nextcloud-server-5d2b892b37d2080957b0ba9c5cc38a85f7209976.zip | |
Fix webdav url
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| -rw-r--r-- | apps/files/lib/Controller/ViewController.php | 2 | ||||
| -rw-r--r-- | apps/files/templates/appnavigation.php | 2 | ||||
| -rw-r--r-- | apps/files/tests/Controller/ViewControllerTest.php | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index 509f927a295..1669d38d796 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -240,6 +240,8 @@ class ViewController extends Controller { $nav->assign('quota', $storageInfo['quota']); $nav->assign('usage_relative', $storageInfo['relative']); + $nav->assign('webdav_url', \OCP\Util::linkToRemote('dav/files/' . $user)); + $contentItems = []; // render the container content for every navigation item diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php index b4436714985..aaf62f1d6b6 100644 --- a/apps/files/templates/appnavigation.php +++ b/apps/files/templates/appnavigation.php @@ -42,7 +42,7 @@ </div> <label for="webdavurl"><?php p($l->t('WebDAV')); ?></label> <input id="webdavurl" type="text" readonly="readonly" - value="<?php p(\OCP\Util::linkToRemote('webdav')); ?>"/> + value="<?php p($_['webdav_url']); ?>"/> <em><?php print_unescaped($l->t('Use this address to <a href="%s" target="_blank" rel="noreferrer noopener">access your Files via WebDAV</a>', array(link_to_docs('user-webdav')))); ?></em> </div> </div> diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php index d051ab7258d..8da12e16b1d 100644 --- a/apps/files/tests/Controller/ViewControllerTest.php +++ b/apps/files/tests/Controller/ViewControllerTest.php @@ -144,7 +144,7 @@ class ViewControllerTest extends TestCase { $nav->assign('usage', '123 B'); $nav->assign('quota', 100); $nav->assign('total_space', '100 B'); - //$nav->assign('webdavurl', ''); + $nav->assign('webdav_url', 'http://localhost/remote.php/dav/files/testuser1/'); $nav->assign('navigationItems', [ 'files' => [ 'id' => 'files', |