Merge pull request #21753 from abpframework/vs-issue-5698

Fix the issue of cancel edit button wrong URL

modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs

@@ -1,4 +1,4 @@
-//#define MONGODB
+#define MONGODB
 
 using System.Collections.Generic;
 using System.Globalization;
@@ -26,9 +26,14 @@ using Volo.Abp.Autofac;
 using Volo.Abp.BlobStoring;
 using Volo.Abp.BlobStoring.Database;
 using Volo.Abp.Data;
+#if MONGODB
+using Volo.Abp.MongoDB;
+#else
 using Volo.Abp.EntityFrameworkCore;
+#endif
 using Volo.Abp.Identity;
 using Volo.Abp.Identity.Web;
+using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.PermissionManagement;
 using Volo.Abp.PermissionManagement.HttpApi;
@@ -39,7 +44,11 @@ using Volo.Abp.VirtualFileSystem;
 using Volo.Blogging;
 using Volo.Blogging.Admin;
 using Volo.Blogging.Files;
+#if MONGODB
+using Volo.BloggingTestApp.MongoDB;
+#else
 using Volo.BloggingTestApp.EntityFrameworkCore;
+#endif
 
 namespace Volo.BloggingTestApp
 {
@@ -78,7 +87,7 @@ namespace Volo.BloggingTestApp
             Configure<BloggingUrlOptions>(options =>
             {
                 options.RoutePrefix = null;
-                options.SingleBlogMode.Enabled = true;
+                options.SingleBlogMode.Enabled = false;
             });
 
             Configure<AbpDbConnectionOptions>(options =>
@@ -146,6 +155,22 @@ namespace Volo.BloggingTestApp
                     container.UseDatabase();
                 });
             });
+            
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Languages.Add(new LanguageInfo("ar", "ar", "العربية"));
+                options.Languages.Add(new LanguageInfo("en", "en", "English"));
+                options.Languages.Add(new LanguageInfo("cs", "cs", "Čeština"));
+                options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish"));
+                options.Languages.Add(new LanguageInfo("fr", "fr", "Français"));
+                options.Languages.Add(new LanguageInfo("sk", "sk", "Slovak"));
+                options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi"));
+                options.Languages.Add(new LanguageInfo("it", "it", "Italiano"));
+                options.Languages.Add(new LanguageInfo("tr", "tr", "Türkçe"));
+                options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português"));
+                options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文"));
+                options.Languages.Add(new LanguageInfo("zh-Hant", "zh-Hant", "繁体中文"));
+            });
         }
 
         public override void OnApplicationInitialization(ApplicationInitializationContext context)

modules/blogging/app/Volo.BloggingTestApp/Program.cs

@@ -1,6 +1,9 @@
 using System;
 using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Serilog;
 using Serilog.Events;
@@ -9,7 +12,7 @@ namespace Volo.BloggingTestApp
 {
     public class Program
     {
-        public static int Main(string[] args)
+        public async static Task<int> Main(string[] args)
         {
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug() //TODO: Should be configurable!
@@ -22,7 +25,14 @@ namespace Volo.BloggingTestApp
             try
             {
                 Log.Information("Starting web host.");
-                CreateHostBuilder(args).Build().Run();
+                var builder = WebApplication.CreateBuilder(args);
+                builder.Host
+                    .UseAutofac()
+                    .UseSerilog();
+                await builder.AddApplicationAsync<BloggingTestAppModule>();
+                var app = builder.Build();
+                await app.InitializeApplicationAsync();
+                await app.RunAsync();
                 return 0;
             }
             catch (Exception ex)
@@ -35,14 +45,5 @@ namespace Volo.BloggingTestApp
                 Log.CloseAndFlush();
             }
         }
-
-        internal static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                })
-                .UseAutofac()
-                .UseSerilog();
     }
 }

modules/blogging/app/Volo.BloggingTestApp/Startup.cs

@@ -1,39 +0,0 @@
-using System;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Volo.Abp;
-using Volo.Abp.Localization;
-
-namespace Volo.BloggingTestApp
-{
-    public class Startup
-    {
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddApplication<BloggingTestAppModule>();
-            
-            services.Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Languages.Add(new LanguageInfo("ar", "ar", "العربية"));
-                options.Languages.Add(new LanguageInfo("en", "en", "English"));
-                options.Languages.Add(new LanguageInfo("cs", "cs", "Čeština"));
-                options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish"));
-                options.Languages.Add(new LanguageInfo("fr", "fr", "Français"));
-                options.Languages.Add(new LanguageInfo("sk", "sk", "Slovak"));
-                options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi"));
-                options.Languages.Add(new LanguageInfo("it", "it", "Italiano"));
-                options.Languages.Add(new LanguageInfo("tr", "tr", "Türkçe"));
-                options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português"));
-                options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文"));
-                options.Languages.Add(new LanguageInfo("zh-Hant", "zh-Hant", "繁体中文"));
-            });
-        }
-
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
-        {
-            app.InitializeApplication();
-        }
-    }
-}

modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj

@@ -23,7 +23,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Volo.Blogging.Admin.HttpApi\Volo.Blogging.Admin.HttpApi.csproj" />
     <ProjectReference Include="..\..\src\Volo.Blogging.HttpApi\Volo.Blogging.HttpApi.csproj" />
-    <ProjectReference Include="..\Volo.BloggingTestApp.EntityFrameworkCore\Volo.BloggingTestApp.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\Volo.BloggingTestApp.MongoDB\Volo.BloggingTestApp.MongoDB.csproj" />
     <ProjectReference Include="..\..\src\Volo.Blogging.Application\Volo.Blogging.Application.csproj" />
     <ProjectReference Include="..\..\src\Volo.Blogging.Web\Volo.Blogging.Web.csproj" />
     <ProjectReference Include="..\..\src\Volo.Blogging.Admin.Application\Volo.Blogging.Admin.Application.csproj" />

modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml

@@ -2,12 +2,16 @@
 @using Volo.Abp.AspNetCore.Mvc.UI.Packages.TuiEditor
 @using Volo.Blogging.Posts
 @using Microsoft.AspNetCore.Mvc.Localization
+@using Microsoft.Extensions.Options
+@using Volo.Blogging
 @using Volo.Blogging.Localization
 @using Volo.Blogging.Pages.Blogs.Posts
 @inject IHtmlLocalizer<BloggingResource> L
 @model Volo.Blogging.Pages.Blogs.Posts.EditModel
+@inject IOptions<BloggingUrlOptions> BloggingUrlOptions
 @{
     ViewBag.PageTitle = "Edit Blog Post";
+    var blogShortNameRouteParam = BloggingUrlOptions.Value.SingleBlogMode.Enabled ? null : Model.BlogShortName;
 }
 @section styles {
     <abp-style-bundle name="@typeof(EditModel).FullName">
@@ -86,7 +90,7 @@
                                 <div class="mt-3 d-flex flex-row-reverse">
                                     <abp-button id="PostFormSubmitButton" button-type="Primary" type="submit" form="edit-post-form" text="@L["Submit"].Value" icon="check" />
 
-                                    <a asp-page="/Blog/Posts/Detail" asp-route-postUrl="@Model.Post.Url" asp-route-blogShortName="@Model.BlogShortName" class="btn btn-default me-2"><span>@L["Cancel"]</span></a>
+                                    <a asp-page="./Detail" asp-route-postUrl="@Model.Post.Url" asp-route-blogShortName="@blogShortNameRouteParam" class="btn btn-default me-2"><span>@L["Cancel"]</span></a>
                                 </div>
                             </div>
                         </form>