From 5daf18e01d0c12732e674dd950446545e723975f Mon Sep 17 00:00:00 2001 From: "Daniel J. Summers" Date: Mon, 30 May 2022 22:33:29 -0400 Subject: [PATCH] Replace URLs in pages when not at directory root --- src/MyWebLog.Domain/ViewModels.fs | 5 ++++- src/MyWebLog/appsettings.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/MyWebLog.Domain/ViewModels.fs b/src/MyWebLog.Domain/ViewModels.fs index d72d807..7f1327e 100644 --- a/src/MyWebLog.Domain/ViewModels.fs +++ b/src/MyWebLog.Domain/ViewModels.fs @@ -93,6 +93,7 @@ type DisplayPage = /// The metadata for the page metadata : MetaItem list } + /// Create a minimal display page (no text or metadata) from a database page static member fromPageMinimal webLog (page : Page) = let pageId = PageId.toString page.id @@ -106,8 +107,10 @@ type DisplayPage = text = "" metadata = [] } + /// Create a display page from a database page static member fromPage webLog (page : Page) = + let _, extra = WebLog.hostAndPath webLog let pageId = PageId.toString page.id { id = pageId title = page.title @@ -116,7 +119,7 @@ type DisplayPage = updatedOn = page.updatedOn showInPageList = page.showInPageList isDefault = pageId = webLog.defaultPage - text = page.text + text = if extra = "" then page.text else page.text.Replace ("href=\"/", $"href=\"{extra}/") metadata = page.metadata } diff --git a/src/MyWebLog/appsettings.json b/src/MyWebLog/appsettings.json index 9f0e53e..b7c6de0 100644 --- a/src/MyWebLog/appsettings.json +++ b/src/MyWebLog/appsettings.json @@ -3,7 +3,7 @@ "hostname": "data02.bitbadger.solutions", "database": "myWebLog_dev" }, - "Generator": "myWebLog 2.0-alpha15", + "Generator": "myWebLog 2.0-alpha16", "Logging": { "LogLevel": { "MyWebLog.Handlers": "Debug"