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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
2 deletions
-
modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs
-
modules/account/src/Volo.Abp.Account.Web.OpenIddict/Pages/Account/OpenIddictSupportedLoginModel.cs
|
|
@ -54,7 +54,8 @@ public class IdentityServerSupportedLoginModel : LoginModel |
|
|
|
|
|
|
|
|
if (context != null) |
|
|
if (context != null) |
|
|
{ |
|
|
{ |
|
|
ShowCancelButton = true; |
|
|
// TODO: Find a proper cancel way.
|
|
|
|
|
|
// ShowCancelButton = true;
|
|
|
|
|
|
|
|
|
LoginInput.UserNameOrEmailAddress = context.LoginHint; |
|
|
LoginInput.UserNameOrEmailAddress = context.LoginHint; |
|
|
|
|
|
|
|
|
|
|
|
@ -34,7 +34,8 @@ public class OpenIddictSupportedLoginModel : LoginModel |
|
|
var request = await OpenIddictRequestHelper.GetFromReturnUrlAsync(ReturnUrl); |
|
|
var request = await OpenIddictRequestHelper.GetFromReturnUrlAsync(ReturnUrl); |
|
|
if (request?.ClientId != null) |
|
|
if (request?.ClientId != null) |
|
|
{ |
|
|
{ |
|
|
ShowCancelButton = true; |
|
|
// TODO: Find a proper cancel way.
|
|
|
|
|
|
// ShowCancelButton = true;
|
|
|
|
|
|
|
|
|
LoginInput.UserNameOrEmailAddress = request.LoginHint; |
|
|
LoginInput.UserNameOrEmailAddress = request.LoginHint; |
|
|
|
|
|
|
|
|
|