From 12a1301b570057152d73097b37da9d559b982a5f Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Fri, 31 May 2019 11:16:38 +0300 Subject: [PATCH] docs "documents/" prefix optional --- modules/docs/app/VoloDocs.Web/appsettings.json | 3 ++- modules/docs/src/Volo.Docs.Web/DocsWebModule.cs | 14 +++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/modules/docs/app/VoloDocs.Web/appsettings.json b/modules/docs/app/VoloDocs.Web/appsettings.json index 2b71262885..044e2e07fe 100644 --- a/modules/docs/app/VoloDocs.Web/appsettings.json +++ b/modules/docs/app/VoloDocs.Web/appsettings.json @@ -1,5 +1,6 @@ { "ConnectionString": "Server=localhost;Database=VoloDocs;Trusted_Connection=True;MultipleActiveResultSets=true", "Title": "VoloDocs", - "LogoUrl": "/assets/images/Logo.png" + "LogoUrl": "/assets/images/Logo.png", + "IncludeDocumentPrefixInUrl": "true" } \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs b/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs index e92a8d21a6..d53536b809 100644 --- a/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs +++ b/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc.RazorPages; +using System; +using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.Mvc.Localization; using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; @@ -35,12 +36,15 @@ namespace Volo.Docs options.FileSets.AddEmbedded("Volo.Docs"); }); + var configuration = context.Services.GetConfiguration(); + Configure(options => { - //TODO: Make configurable! - options.Conventions.AddPageRoute("/Documents/Project/Index", "documents/{projectName}"); - options.Conventions.AddPageRoute("/Documents/Project/Index", "documents/{languageCode}/{projectName}"); - options.Conventions.AddPageRoute("/Documents/Project/Index", "documents/{languageCode}/{projectName}/{version}/{*documentName}"); + var prefix = Convert.ToBoolean(configuration["IncludeDocumentPrefixInUrl"]) ? "documents/" : ""; + + options.Conventions.AddPageRoute("/Documents/Project/Index", prefix + "{projectName}"); + options.Conventions.AddPageRoute("/Documents/Project/Index", prefix + "{languageCode}/{projectName}"); + options.Conventions.AddPageRoute("/Documents/Project/Index", prefix + "{languageCode}/{projectName}/{version}/{*documentName}"); }); Configure(options =>