Browse Source

Merge pull request #14060 from abpframework/6.0-remove-cancel-from-logic

Change default value of ShowCancelButton to false
pull/14063/head
Alper Ebiçoğlu 4 years ago
committed by GitHub
parent
commit
4e4b869493
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs
  2. 3
      modules/account/src/Volo.Abp.Account.Web.OpenIddict/Pages/Account/OpenIddictSupportedLoginModel.cs

3
modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs

@ -54,7 +54,8 @@ public class IdentityServerSupportedLoginModel : LoginModel
if (context != null)
{
ShowCancelButton = true;
// TODO: Find a proper cancel way.
// ShowCancelButton = true;
LoginInput.UserNameOrEmailAddress = context.LoginHint;

3
modules/account/src/Volo.Abp.Account.Web.OpenIddict/Pages/Account/OpenIddictSupportedLoginModel.cs

@ -34,7 +34,8 @@ public class OpenIddictSupportedLoginModel : LoginModel
var request = await OpenIddictRequestHelper.GetFromReturnUrlAsync(ReturnUrl);
if (request?.ClientId != null)
{
ShowCancelButton = true;
// TODO: Find a proper cancel way.
// ShowCancelButton = true;
LoginInput.UserNameOrEmailAddress = request.LoginHint;

Loading…
Cancel
Save