TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 10:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #583 from eikek/fix-baseurl-setting

Browse Source 
Render baseurl without trailing slash
This commit is contained in:
mergify[bot]
2021-01-21 23:44:14 +00:00
committed by GitHub
parent 38e0a50942 0ec620fcf0
commit 8dd1672c8c
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/restserver/src/main/scala/docspell/restserver/webapp/Flags.scala
View File

@ -36,8 +36,8 @@ object Flags {
)
private def getBaseUrl(cfg: Config): String =
if (cfg.baseUrl.isLocal) cfg.baseUrl.path.asString
else cfg.baseUrl.asString
if (cfg.baseUrl.isLocal) cfg.baseUrl.rootPathToEmpty.path.asString
else cfg.baseUrl.rootPathToEmpty.asString
implicit val jsonEncoder: Encoder[Flags] =
deriveEncoder[Flags]