TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-07 07:35:59 +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
commit 8dd1672c8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/common/src/main/scala/docspell/common/LenientUri.scala
View File

@ -49,6 +49,12 @@ case class LenientUri(
def withFragment(f: String): LenientUri = def withFragment(f: String): LenientUri =
copy(fragment = Some(f)) copy(fragment = Some(f))
def rootPathToEmpty: LenientUri =
path match {
case LenientUri.RootPath => copy(path = LenientUri.EmptyPath)
case _ => this
}
def toJavaUrl: Either[String, URL] = def toJavaUrl: Either[String, URL] =
Either.catchNonFatal(new URL(asString)).left.map(_.getMessage) Either.catchNonFatal(new URL(asString)).left.map(_.getMessage)

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 = private def getBaseUrl(cfg: Config): String =
if (cfg.baseUrl.isLocal) cfg.baseUrl.path.asString if (cfg.baseUrl.isLocal) cfg.baseUrl.rootPathToEmpty.path.asString
else cfg.baseUrl.asString else cfg.baseUrl.rootPathToEmpty.asString
implicit val jsonEncoder: Encoder[Flags] = implicit val jsonEncoder: Encoder[Flags] =
deriveEncoder[Flags] deriveEncoder[Flags]