Fix webdav url

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
index ed3fff223f770dad556d230c3c0786340d61c660..688db41f8b0f36e4e36e8ecae9f9e775a375eab3 100644 (file)
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@ -248,6 +248,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 b44367149850e8f14c6640caf46b589603bf7d51..aaf62f1d6b672b794a6a50bcbb678576e1fe2f8f 100644 (file)
--- 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 f07af2a2fe5e4bcda92a272f8019e6dbad9187f8..30d7bdfdc6da4417dac3d1e9065232df41dccc70 100644 (file)
--- a/apps/files/tests/Controller/ViewControllerTest.php
+++ b/apps/files/tests/Controller/ViewControllerTest.php
@@ -147,7 +147,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',