From 758333991c06c7024698b3b24aa7bff59fedfb0c Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 13 Apr 2020 15:42:14 +0800 Subject: [PATCH 1/2] Use IActionResult as the return value of the page method in the module. #3495 --- .../Pages/Consent.cshtml.cs | 4 +++- .../Volo.Abp.Account.Web/Pages/Account/Logout.cshtml.cs | 4 ++-- .../Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs | 9 ++++++--- .../Pages/Account/Register.cshtml.cs | 4 +++- .../Pages/Account/SendSecurityCode.cshtml.cs | 4 ++-- .../Volo.Blogging.Web/Pages/Admin/Blogs/Edit.cshtml.cs | 4 +++- .../Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs | 8 ++++++-- .../Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml.cs | 4 +++- .../Pages/ClientSimulation/Index.cshtml.cs | 5 +++-- .../Pages/ClientSimulation/SimulationArea.cshtml.cs | 4 ++-- .../Pages/Docs/Admin/Projects/Index.cshtml.cs | 4 +++- .../Pages/Identity/Roles/CreateModal.cshtml.cs | 4 ++-- .../Pages/Identity/Roles/Index.cshtml.cs | 9 +++++---- .../Pages/Identity/Users/CreateModal.cshtml.cs | 4 +++- .../Pages/Identity/Users/EditModal.cshtml.cs | 4 +++- .../Pages/Identity/Users/Index.cshtml.cs | 9 +++++---- .../PermissionManagementModal.cshtml.cs | 4 +++- .../Pages/SettingManagement/Index.cshtml.cs | 9 ++++++--- .../Tenants/ConnectionStringsModal.cshtml.cs | 6 ++++-- .../Pages/TenantManagement/Tenants/CreateModal.cshtml.cs | 6 +++--- .../Pages/TenantManagement/Tenants/EditModal.cshtml.cs | 4 +++- .../Pages/TenantManagement/Tenants/Index.cshtml.cs | 9 +++++---- 22 files changed, 78 insertions(+), 44 deletions(-) diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml.cs index 2df177b620..332892822f 100644 --- a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml.cs +++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Consent.cshtml.cs @@ -42,7 +42,7 @@ namespace Volo.Abp.Account.Web.Pages _resourceStore = resourceStore; } - public virtual async Task OnGet() + public virtual async Task OnGet() { var request = await _interaction.GetAuthorizationContextAsync(ReturnUrl); if (request == null) @@ -74,6 +74,8 @@ namespace Volo.Abp.Account.Web.Pages { ConsentInput.ApiScopes.Add(GetOfflineAccessScope(true)); } + + return Page(); } public virtual async Task OnPost(string userDecision) diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Logout.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Logout.cshtml.cs index de62eb370d..8cb2c2bc1e 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Logout.cshtml.cs +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Logout.cshtml.cs @@ -24,9 +24,9 @@ namespace Volo.Abp.Account.Web.Pages.Account return RedirectToPage("/Account/Login"); } - public virtual Task OnPostAsync() + public virtual Task OnPostAsync() { - return Task.CompletedTask; + return Task.FromResult(Page()); } } } diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs index 58614de744..deed56b736 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs @@ -1,6 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; using Volo.Abp.Identity; +using Microsoft.AspNetCore.Mvc; namespace Volo.Abp.Account.Web.Pages.Account { @@ -17,16 +18,18 @@ namespace Volo.Abp.Account.Web.Pages.Account ProfileAppService = profileAppService; } - public virtual async Task OnGetAsync() + public virtual async Task OnGetAsync() { var user = await ProfileAppService.GetAsync(); PersonalSettingsInfoModel = ObjectMapper.Map(user); + + return Page(); } - public virtual Task OnPostAsync() + public virtual Task OnPostAsync() { - return Task.CompletedTask; + return Task.FromResult(Page()); } } diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs index db085d6587..3b5a5b2cd1 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs @@ -31,9 +31,11 @@ namespace Volo.Abp.Account.Web.Pages.Account AccountAppService = accountAppService; } - public virtual async Task OnGetAsync() + public virtual async Task OnGetAsync() { await CheckSelfRegistrationAsync(); + + return Page(); } public virtual async Task OnPostAsync() diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/SendSecurityCode.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/SendSecurityCode.cshtml.cs index 94a52cd0bd..56f2e44b85 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/SendSecurityCode.cshtml.cs +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/SendSecurityCode.cshtml.cs @@ -41,9 +41,9 @@ namespace Volo.Abp.Account.Web.Pages.Account //); } - public virtual Task OnPostAsync() + public virtual Task OnPostAsync() { - return Task.CompletedTask; + return Task.FromResult(Page()); } } } \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Edit.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Edit.cshtml.cs index 9a15efd829..3f3c0ea08a 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Edit.cshtml.cs +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Edit.cshtml.cs @@ -43,7 +43,7 @@ namespace Volo.Blogging.Pages.Admin.Blogs return Page(); } - public async Task OnPostAsync() + public async Task OnPostAsync() { await _blogAppService.Update(Blog.Id, new UpdateBlogDto() { @@ -51,6 +51,8 @@ namespace Volo.Blogging.Pages.Admin.Blogs ShortName = Blog.ShortName, Description = Blog.Description }); + + return Page(); } public class BlogEditViewModel diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs index f6e86a2218..e9edf37a7e 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs @@ -46,12 +46,14 @@ namespace Volo.Blogging.Pages.Blog.Posts _commentAppService = commentAppService; } - public async Task OnGetAsync() + public async Task OnGetAsync() { await GetData(); + + return Page(); } - public async Task OnPostAsync() + public async Task OnPostAsync() { var comment = await _commentAppService.CreateAsync(new CreateCommentDto() { @@ -63,6 +65,8 @@ namespace Volo.Blogging.Pages.Blog.Posts FocusCommentId = comment.Id; await GetData(); + + return Page(); } private async Task GetData() diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml.cs index f27d4e8f05..5dec995b97 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml.cs +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml.cs @@ -35,11 +35,13 @@ namespace Volo.Blogging.Pages.Blog.Posts _tagAppService = tagAppService; } - public async Task OnGetAsync() + public async Task OnGetAsync() { Blog = await _blogAppService.GetByShortNameAsync(BlogShortName); Posts = (await _postAppService.GetListByBlogIdAndTagName(Blog.Id, TagName)).Items; PopularTags = (await _tagAppService.GetPopularTags(Blog.Id, new GetPopularTagsInput {ResultCount = 10, MinimumPostCount = 2})); + + return Page(); } } } \ No newline at end of file diff --git a/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml.cs b/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml.cs index 8636bf2567..62795587da 100644 --- a/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml.cs +++ b/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml.cs @@ -1,13 +1,14 @@ using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; namespace Volo.ClientSimulation.Pages.ClientSimulation { public class IndexModel : PageModel { - public async Task OnGetAsync() + public Task OnGetAsync() { - + return Task.FromResult(Page()); } } } \ No newline at end of file diff --git a/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml.cs b/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml.cs index e55f504f10..01710098aa 100644 --- a/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml.cs +++ b/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml.cs @@ -16,10 +16,10 @@ namespace Volo.ClientSimulation.Pages.ClientSimulation Simulation = simulation; } - public Task OnGetAsync() + public Task OnGetAsync() { Snapshot = Simulation.CreateSnapshot(); - return Task.CompletedTask; + return Task.FromResult(Page()); } public async Task OnPostStartAsync() diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml.cs index de530d36b8..7da4796fbd 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml.cs +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects @@ -6,8 +7,9 @@ namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects [Authorize(DocsAdminPermissions.Projects.Default)] public class IndexModel : DocsAdminPageModel { - public void OnGet() + public ActionResult OnGet() { + return Page(); } } } \ No newline at end of file diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs index 6d022c7048..e7244c80f1 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs @@ -16,9 +16,9 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Roles IdentityRoleAppService = identityRoleAppService; } - public virtual Task OnGetAsync() + public virtual Task OnGetAsync() { - return Task.CompletedTask; + return Task.FromResult(Page()); } public virtual async Task OnPostAsync() diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml.cs index 0fab86d195..254c1785bc 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml.cs +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml.cs @@ -1,17 +1,18 @@ using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; namespace Volo.Abp.Identity.Web.Pages.Identity.Roles { public class IndexModel : IdentityPageModel { - public virtual Task OnGetAsync() + public virtual Task OnGetAsync() { - return Task.CompletedTask; + return Task.FromResult(Page()); } - public virtual Task OnPostAsync() + public virtual Task OnPostAsync() { - return Task.CompletedTask; + return Task.FromResult(Page()); } } } \ No newline at end of file diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml.cs index f480ee925f..9622d87de2 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml.cs +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml.cs @@ -25,7 +25,7 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Users IdentityRoleAppService = identityRoleAppService; } - public virtual async Task OnGetAsync() + public virtual async Task OnGetAsync() { UserInfo = new UserInfoViewModel(); @@ -37,6 +37,8 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Users { role.IsAssigned = role.IsDefault; } + + return Page(); } public virtual async Task OnPostAsync() diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs index df676ecaf4..7ffb58ccab 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs @@ -27,7 +27,7 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Users IdentityRoleAppService = identityRoleAppService; } - public virtual async Task OnGetAsync(Guid id) + public virtual async Task OnGetAsync(Guid id) { UserInfo = ObjectMapper.Map(await IdentityUserAppService.GetAsync(id)); @@ -41,6 +41,8 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Users role.IsAssigned = true; } } + + return Page(); } public virtual async Task OnPostAsync() diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml.cs index d1382c59b6..b6ff2c0e94 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml.cs +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml.cs @@ -1,17 +1,18 @@ using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; namespace Volo.Abp.Identity.Web.Pages.Identity.Users { public class IndexModel : IdentityPageModel { - public virtual Task OnGetAsync() + public virtual Task OnGetAsync() { - return Task.CompletedTask; + return Task.FromResult(Page()); } - public virtual Task OnPostAsync() + public virtual Task OnPostAsync() { - return Task.CompletedTask; + return Task.FromResult(Page()); } } } diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs index 02f5a8af17..041121b8cb 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs @@ -38,7 +38,7 @@ namespace Volo.Abp.PermissionManagement.Web.Pages.AbpPermissionManagement PermissionAppService = permissionAppService; } - public virtual async Task OnGetAsync() + public virtual async Task OnGetAsync() { ValidateModel(); @@ -62,6 +62,8 @@ namespace Volo.Abp.PermissionManagement.Web.Pages.AbpPermissionManagement } SelectAllInAllTabs = Groups.All(g => g.IsAllPermissionsGranted); + + return Page(); } public virtual async Task OnPostAsync() diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs index 31602957cf..7f9c332e13 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; using Microsoft.Extensions.Options; +using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; namespace Volo.Abp.SettingManagement.Web.Pages.SettingManagement @@ -16,7 +17,7 @@ namespace Volo.Abp.SettingManagement.Web.Pages.SettingManagement Options = options.Value; } - public virtual async Task OnGetAsync() + public virtual async Task OnGetAsync() { SettingPageCreationContext = new SettingPageCreationContext(ServiceProvider); @@ -24,11 +25,13 @@ namespace Volo.Abp.SettingManagement.Web.Pages.SettingManagement { await contributor.ConfigureAsync(SettingPageCreationContext); } + + return Page(); } - public virtual Task OnPostAsync() + public virtual Task OnPostAsync() { - return Task.CompletedTask; + return Task.FromResult(Page()); } } } \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs index 5456e512ec..9093437f98 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; @@ -17,7 +17,7 @@ namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants TenantAppService = tenantAppService; } - public virtual async Task OnGetAsync(Guid id) + public virtual async Task OnGetAsync(Guid id) { var defaultConnectionString = await TenantAppService.GetDefaultConnectionStringAsync(id); Tenant = new TenantInfoModel @@ -26,6 +26,8 @@ namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants DefaultConnectionString = defaultConnectionString, UseSharedDatabase = defaultConnectionString.IsNullOrWhiteSpace() }; + + return Page(); } public virtual async Task OnPostAsync() diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs index 86569149f8..fa517594ee 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs @@ -1,4 +1,4 @@ -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; @@ -16,9 +16,9 @@ namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants TenantAppService = tenantAppService; } - public virtual Task OnGetAsync() + public virtual Task OnGetAsync() { - return Task.CompletedTask; + return Task.FromResult(Page()); } public virtual async Task OnPostAsync() diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml.cs index 1ae5709d57..74ac176b02 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml.cs @@ -17,11 +17,13 @@ namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants TenantAppService = tenantAppService; } - public virtual async Task OnGetAsync(Guid id) + public virtual async Task OnGetAsync(Guid id) { Tenant = ObjectMapper.Map( await TenantAppService.GetAsync(id) ); + + return Page(); } public virtual async Task OnPostAsync() diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml.cs index 93bc14a62b..11395d870f 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml.cs @@ -1,18 +1,19 @@ using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants { public class IndexModel : TenantManagementPageModel { - public virtual Task OnGetAsync() + public virtual Task OnGetAsync() { - return Task.CompletedTask; + return Task.FromResult(Page()); } - public virtual Task OnPostAsync() + public virtual Task OnPostAsync() { - return Task.CompletedTask; + return Task.FromResult(Page()); } } } \ No newline at end of file From 21b3e1c40df400a697de874520b25a2c91e86ff5 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 13 Apr 2020 15:53:54 +0800 Subject: [PATCH 2/2] Make the page method virtual. --- .../Volo.Blogging.Web/Pages/Admin/Blogs/Create.cshtml.cs | 4 ++-- .../src/Volo.Blogging.Web/Pages/Admin/Blogs/Edit.cshtml.cs | 4 ++-- .../src/Volo.Blogging.Web/Pages/Admin/Blogs/Index.cshtml.cs | 2 +- .../src/Volo.Blogging.Web/Pages/Blogs/Index.cshtml.cs | 2 +- .../Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs | 4 ++-- .../src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml.cs | 4 ++-- .../src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml.cs | 2 +- .../src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml.cs | 4 ++-- .../Pages/ClientSimulation/Index.cshtml.cs | 2 +- .../Pages/ClientSimulation/SimulationArea.cshtml.cs | 6 +++--- modules/docs/app/VoloDocs.Web/Pages/Index.cshtml.cs | 2 +- .../Pages/Docs/Admin/Projects/Create.cshtml.cs | 4 ++-- .../Pages/Docs/Admin/Projects/Edit.cshtml.cs | 4 ++-- .../Pages/Docs/Admin/Projects/Index.cshtml.cs | 5 +++-- .../Pages/Docs/Admin/Projects/Pull.cshtml.cs | 4 ++-- .../docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml.cs | 2 +- .../Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs | 2 +- .../docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs | 2 +- 18 files changed, 30 insertions(+), 29 deletions(-) diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Create.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Create.cshtml.cs index c23661a0a2..f8c40a1b01 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Create.cshtml.cs +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Create.cshtml.cs @@ -24,7 +24,7 @@ namespace Volo.Blogging.Pages.Admin.Blogs _authorization = authorization; } - public async Task OnGetAsync() + public virtual async Task OnGetAsync() { if (!await _authorization.IsGrantedAsync(BloggingPermissions.Blogs.Create)) { @@ -34,7 +34,7 @@ namespace Volo.Blogging.Pages.Admin.Blogs return Page(); } - public async Task OnPostAsync() + public virtual async Task OnPostAsync() { var blogDto = ObjectMapper.Map(Blog); diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Edit.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Edit.cshtml.cs index 3f3c0ea08a..9c40720261 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Edit.cshtml.cs +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Edit.cshtml.cs @@ -29,7 +29,7 @@ namespace Volo.Blogging.Pages.Admin.Blogs _authorization = authorization; } - public async Task OnGetAsync() + public virtual async Task OnGetAsync() { if (!await _authorization.IsGrantedAsync(BloggingPermissions.Blogs.Update)) { @@ -43,7 +43,7 @@ namespace Volo.Blogging.Pages.Admin.Blogs return Page(); } - public async Task OnPostAsync() + public virtual async Task OnPostAsync() { await _blogAppService.Update(Blog.Id, new UpdateBlogDto() { diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Index.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Index.cshtml.cs index 367f19d60c..038f2e63f3 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Index.cshtml.cs +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/Index.cshtml.cs @@ -15,7 +15,7 @@ namespace Volo.Blogging.Pages.Admin.Blogs _authorization = authorization; } - public async Task OnGetAsync() + public virtual async Task OnGetAsync() { if (!await _authorization.IsGrantedAsync(BloggingPermissions.Blogs.Management)) { diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Index.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Index.cshtml.cs index cf16556c66..2835b05dc5 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Index.cshtml.cs +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Index.cshtml.cs @@ -19,7 +19,7 @@ namespace Volo.Blogging.Pages.Blog _blogAppService = blogAppService; } - public async Task OnGetAsync() + public virtual async Task OnGetAsync() { var result = await _blogAppService.GetListAsync(); diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs index e9edf37a7e..c2e9eb8ec8 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs @@ -46,14 +46,14 @@ namespace Volo.Blogging.Pages.Blog.Posts _commentAppService = commentAppService; } - public async Task OnGetAsync() + public virtual async Task OnGetAsync() { await GetData(); return Page(); } - public async Task OnPostAsync() + public virtual async Task OnPostAsync() { var comment = await _commentAppService.CreateAsync(new CreateCommentDto() { diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml.cs index 2203aacbea..90e9209645 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml.cs +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml.cs @@ -33,7 +33,7 @@ namespace Volo.Blogging.Pages.Blog.Posts _authorization = authorization; } - public async Task OnGetAsync() + public virtual async Task OnGetAsync() { if (!await _authorization.IsGrantedAsync(BloggingPermissions.Posts.Update)) { @@ -47,7 +47,7 @@ namespace Volo.Blogging.Pages.Blog.Posts return Page(); } - public async Task OnPostAsync() + public virtual async Task OnPostAsync() { var post = new UpdatePostDto { diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml.cs index 5dec995b97..0b0597c60f 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml.cs +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml.cs @@ -35,7 +35,7 @@ namespace Volo.Blogging.Pages.Blog.Posts _tagAppService = tagAppService; } - public async Task OnGetAsync() + public virtual async Task OnGetAsync() { Blog = await _blogAppService.GetByShortNameAsync(BlogShortName); Posts = (await _postAppService.GetListByBlogIdAndTagName(Blog.Id, TagName)).Items; diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml.cs index 353e469590..11c853b30c 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml.cs +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml.cs @@ -35,7 +35,7 @@ namespace Volo.Blogging.Pages.Blog.Posts _blogOptions = blogOptions.Value; } - public async Task OnGetAsync() + public virtual async Task OnGetAsync() { if (!await _authorization.IsGrantedAsync(BloggingPermissions.Posts.Create)) { @@ -51,7 +51,7 @@ namespace Volo.Blogging.Pages.Blog.Posts return Page(); } - public async Task OnPost() + public virtual async Task OnPost() { var blog = await _blogAppService.GetAsync(Post.BlogId); diff --git a/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml.cs b/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml.cs index 62795587da..823be7aa53 100644 --- a/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml.cs +++ b/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml.cs @@ -6,7 +6,7 @@ namespace Volo.ClientSimulation.Pages.ClientSimulation { public class IndexModel : PageModel { - public Task OnGetAsync() + public virtual Task OnGetAsync() { return Task.FromResult(Page()); } diff --git a/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml.cs b/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml.cs index 01710098aa..094e8358e2 100644 --- a/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml.cs +++ b/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml.cs @@ -16,19 +16,19 @@ namespace Volo.ClientSimulation.Pages.ClientSimulation Simulation = simulation; } - public Task OnGetAsync() + public virtual Task OnGetAsync() { Snapshot = Simulation.CreateSnapshot(); return Task.FromResult(Page()); } - public async Task OnPostStartAsync() + public virtual async Task OnPostStartAsync() { Simulation.Start(); return new NoContentResult(); } - public async Task OnPostStopAsync() + public virtual async Task OnPostStopAsync() { Simulation.Stop(); return new NoContentResult(); diff --git a/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml.cs b/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml.cs index 537d650f83..8e4a26db44 100644 --- a/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml.cs +++ b/modules/docs/app/VoloDocs.Web/Pages/Index.cshtml.cs @@ -24,7 +24,7 @@ namespace VoloDocs.Web.Pages _urlUiOptions = urlOptions.Value; } - public async Task OnGetAsync() + public virtual async Task OnGetAsync() { var projects = await _projectAppService.GetListAsync(); diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Create.cshtml.cs b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Create.cshtml.cs index dc4af5e94c..e6de68a3b1 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Create.cshtml.cs +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Create.cshtml.cs @@ -29,7 +29,7 @@ namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects _projectAppService = projectAppService; } - public async Task OnGetAsync(string source) + public virtual async Task OnGetAsync(string source) { if (source != null && source.ToLowerInvariant() == "github") { @@ -42,7 +42,7 @@ namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects } } - public async Task OnPostAsync() + public virtual async Task OnPostAsync() { if (GithubProject != null) { diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Edit.cshtml.cs b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Edit.cshtml.cs index 49b569d18c..3b9aba5303 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Edit.cshtml.cs +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Edit.cshtml.cs @@ -29,7 +29,7 @@ namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects _projectAppService = projectAppService; } - public async Task OnGetAsync(Guid id) + public virtual async Task OnGetAsync(Guid id) { var project = await _projectAppService.GetAsync(id); @@ -42,7 +42,7 @@ namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects throw new BusinessException("UnknowDocumentSourceExceptionMessage"); } - public async Task OnPostAsync() + public virtual async Task OnPostAsync() { if (GithubProject != null) { diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml.cs index 7da4796fbd..bfac3a2220 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml.cs +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml.cs @@ -1,3 +1,4 @@ +using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; @@ -7,9 +8,9 @@ namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects [Authorize(DocsAdminPermissions.Projects.Default)] public class IndexModel : DocsAdminPageModel { - public ActionResult OnGet() + public virtual Task OnGet() { - return Page(); + return Task.FromResult(Page()); } } } \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Pull.cshtml.cs b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Pull.cshtml.cs index dd1b5c2ac9..195337a22e 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Pull.cshtml.cs +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Pull.cshtml.cs @@ -23,7 +23,7 @@ namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects _documentAppService = documentAppService; } - public async Task OnGetAsync(Guid id) + public virtual async Task OnGetAsync(Guid id) { var project = await _projectAppService.GetAsync(id); @@ -36,7 +36,7 @@ namespace Volo.Docs.Admin.Pages.Docs.Admin.Projects return Page(); } - public async Task OnPostAsync() + public virtual async Task OnPostAsync() { if (PullDocument.All) { diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml.cs index 50db79cb43..74fa74090d 100644 --- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml.cs +++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Index.cshtml.cs @@ -25,7 +25,7 @@ namespace Volo.Docs.Pages.Documents _uiOptions = urlOptions.Value; } - public async Task OnGetAsync() + public virtual async Task OnGetAsync() { DocumentsUrlPrefix = _uiOptions.RoutePrefix; diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs index 56f9dac913..bd5029caef 100644 --- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs +++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs @@ -92,7 +92,7 @@ namespace Volo.Docs.Pages.Documents.Project _uiOptions = options.Value; } - public async Task OnGetAsync() + public virtual async Task OnGetAsync() { try { diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs index 7be8271b0f..702141bc1e 100644 --- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs +++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs @@ -39,7 +39,7 @@ namespace Volo.Docs.Pages.Documents public List SearchOutputs { get; set; } = new List(); - public async Task OnGetAsync(string keyword) + public virtual async Task OnGetAsync(string keyword) { if (!await _documentAppService.FullSearchEnabledAsync()) {