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

Merge pull request #9082 from nextcloud/feature/8795/new_webdav_url_in_web 

Show the new dav url in the web UI
This commit is contained in:
Roeland Jago Douma 2018-04-05 14:51:52 +02:00 committed by GitHub
parent 1f605cb841 9b05413bcb
commit 6ea444b243
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/files/lib/Controller/ViewController.php
View File

@ -175,6 +175,12 @@ class ViewController extends Controller {
});
$nav->assign('navigationItems', $navItems);
$webdavurl = $this->urlGenerator->linkTo('', 'remote.php') .
'/dav/files/' .
$this->userSession->getUser()->getUID() .
'/';
$webdavurl = $this->urlGenerator->getAbsoluteURL($webdavurl);
$nav->assign('webdavurl', $webdavurl);
$nav->assign('usage', \OC_Helper::humanFileSize($storageInfo['used']));
if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {

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

@ -41,7 +41,7 @@
<label for="showhiddenfilesToggle"><?php p($l->t('Show hidden files')); ?></label>
</div>
<label for="webdavurl"><?php p($l->t('WebDAV'));?></label>
<input id="webdavurl" type="text" readonly="readonly" value="<?php p(\OCP\Util::linkToRemote('webdav')); ?>" />
<input id="webdavurl" type="text" readonly="readonly" value="<?php p($_['webdavurl']); ?>" />
<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>

1
apps/files/tests/Controller/ViewControllerTest.php
View File

@ -138,6 +138,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('navigationItems', [
[
'id' => 'files',