IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Include missing search service on login modal (#24432)

Browse Source
This commit is contained in:
Isaac Janzen 2023-11-17 11:13:37 -07:00 committed by GitHub
parent 1e0de818e6
commit c55c354a13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/app/components/modal/login.hbs
View File

@ -47,7 +47,7 @@
@otherMethodAllowed={{this.otherMethodAllowed}} @otherMethodAllowed={{this.otherMethodAllowed}}
@showSecondFactor={{this.showSecondFactor}} @showSecondFactor={{this.showSecondFactor}}
@handleForgotPassword={{this.handleForgotPassword}} @handleForgotPassword={{this.handleForgotPassword}}
@login={{this.login}} @login={{this.triggerLogin}}
@flashChanged={{this.flashChanged}} @flashChanged={{this.flashChanged}}
@flashTypeChanged={{this.flashTypeChanged}} @flashTypeChanged={{this.flashTypeChanged}}
@securityKeyCredentialChanged={{this.securityKeyCredentialChanged}} @securityKeyCredentialChanged={{this.securityKeyCredentialChanged}}
@ -55,7 +55,7 @@
<Modal::Login::Footer <Modal::Login::Footer
@canLoginLocal={{this.canLoginLocal}} @canLoginLocal={{this.canLoginLocal}}
@showSecurityKey={{this.showSecurityKey}} @showSecurityKey={{this.showSecurityKey}}
@login={{this.login}} @login={{this.triggerLogin}}
@loginButtonLabel={{this.loginButtonLabel}} @loginButtonLabel={{this.loginButtonLabel}}
@loginDisabled={{this.loginDisabled}} @loginDisabled={{this.loginDisabled}}
@showSignupLink={{this.showSignupLink}} @showSignupLink={{this.showSignupLink}}

3
app/assets/javascripts/discourse/app/components/modal/login.js
View File

@ -23,6 +23,7 @@ export default class Login extends Component {
@service dialog; @service dialog;
@service siteSettings; @service siteSettings;
@service site; @service site;
@service login;
@tracked loggingIn = false; @tracked loggingIn = false;
@tracked loggedIn = false; @tracked loggedIn = false;
@ -173,7 +174,7 @@ export default class Login extends Component {
} }
@action @action
async login() { async triggerLogin() {
if (this.loginDisabled) { if (this.loginDisabled) {
return; return;
} }