wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[stable17] Fix webdav url (#18823)

Browse source 
[stable17] Fix webdav url
This commit is contained in:
John Molakvoæ 2020-01-11 10:19:08 +01:00 committed by GitHub
commit d4830a97ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files/lib/Controller/ViewController.php
View file

@ -240,6 +240,8 @@ class ViewController extends Controller {
$nav->assign('quota', $storageInfo['quota']); $nav->assign('quota', $storageInfo['quota']);
$nav->assign('usage_relative', $storageInfo['relative']); $nav->assign('usage_relative', $storageInfo['relative']);
$nav->assign('webdav_url', \OCP\Util::linkToRemote('dav/files/' . $user));
$contentItems = []; $contentItems = [];
// render the container content for every navigation item // render the container content for every navigation item

2
apps/files/templates/appnavigation.php
View file

@ -42,7 +42,7 @@
</div> </div>
<label for="webdavurl"><?php p($l->t('WebDAV')); ?></label> <label for="webdavurl"><?php p($l->t('WebDAV')); ?></label>
<input id="webdavurl" type="text" readonly="readonly" <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> <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>
</div> </div>

2
apps/files/tests/Controller/ViewControllerTest.php
View file

@ -144,7 +144,7 @@ class ViewControllerTest extends TestCase {
$nav->assign('usage', '123 B'); $nav->assign('usage', '123 B');
$nav->assign('quota', 100); $nav->assign('quota', 100);
$nav->assign('total_space', '100 B'); $nav->assign('total_space', '100 B');
//$nav->assign('webdavurl', ''); $nav->assign('webdav_url', 'http://localhost/remote.php/dav/files/testuser1/');
$nav->assign('navigationItems', [ $nav->assign('navigationItems', [
'files' => [ 'files' => [
'id' => 'files', 'id' => 'files',