From d348e9715ff272a059970afddb5a879faf597f33 Mon Sep 17 00:00:00 2001 From: Goti Ankit Date: Tue, 22 Jun 2021 10:51:05 +0530 Subject: [PATCH] Allowed pages for external module. Login internal module while edit, resolved error to be edit. --- Oqtane.Client/Modules/Admin/Login/Index.razor | 3 ++- Oqtane.Server/Extensions/OqtaneMvcBuilderExtensions.cs | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor index 17340094..179209b4 100644 --- a/Oqtane.Client/Modules/Admin/Login/Index.razor +++ b/Oqtane.Client/Modules/Admin/Login/Index.razor @@ -95,7 +95,8 @@ protected override async Task OnAfterRenderAsync(bool firstRender) { - if (firstRender) + if (firstRender && !(EqualityComparer.Default.Equals(username, + default(ElementReference)))) { await username.FocusAsync(); } diff --git a/Oqtane.Server/Extensions/OqtaneMvcBuilderExtensions.cs b/Oqtane.Server/Extensions/OqtaneMvcBuilderExtensions.cs index b3f489bf..13668322 100644 --- a/Oqtane.Server/Extensions/OqtaneMvcBuilderExtensions.cs +++ b/Oqtane.Server/Extensions/OqtaneMvcBuilderExtensions.cs @@ -1,9 +1,10 @@ -using System; +using System; using System.Linq; using System.Reflection; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ApplicationParts; using Oqtane.Infrastructure; +using Microsoft.AspNetCore.Mvc.RazorPages; // ReSharper disable once CheckNamespace namespace Microsoft.Extensions.DependencyInjection @@ -22,7 +23,7 @@ namespace Microsoft.Extensions.DependencyInjection foreach (var assembly in assemblies) { // check if assembly contains MVC Controllers - if (assembly.GetTypes().Any(t => t.IsSubclassOf(typeof(Controller)))) + if (assembly.GetTypes().Any(t => t.IsSubclassOf(typeof(Controller)) || t.IsSubclassOf(typeof(Page)))) { var partFactory = ApplicationPartFactory.GetApplicationPartFactory(assembly); foreach (var part in partFactory.GetApplicationParts(assembly))