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:
commit
6ea444b243
|
@ -175,6 +175,12 @@ class ViewController extends Controller {
|
||||||
});
|
});
|
||||||
$nav->assign('navigationItems', $navItems);
|
$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']));
|
$nav->assign('usage', \OC_Helper::humanFileSize($storageInfo['used']));
|
||||||
if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
|
if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
<label for="showhiddenfilesToggle"><?php p($l->t('Show hidden files')); ?></label>
|
<label for="showhiddenfilesToggle"><?php p($l->t('Show hidden files')); ?></label>
|
||||||
</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" 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>
|
<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>
|
||||||
|
|
|
@ -138,6 +138,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('navigationItems', [
|
$nav->assign('navigationItems', [
|
||||||
[
|
[
|
||||||
'id' => 'files',
|
'id' => 'files',
|
||||||
|
|
Loading…
Reference in New Issue