Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Allow `ForgotPassword` `emailOrUsername` arg to be null (#23246)

This commit is contained in:
Isaac Janzen 2023-08-24 17:36:02 -05:00 committed by GitHub
parent bffd61746b
commit eab3bfc8d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse/app/components/modal/forgot-password.js
View File

@ -14,7 +14,8 @@ import { htmlSafe } from "@ember/template";
export default class ForgotPassword extends Component {
@service siteSettings;
@tracked emailOrUsername = cookie("email") || this.args.model.emailOrUsername;
@tracked
emailOrUsername = cookie("email") || this.args.model?.emailOrUsername || "";
@tracked disabled = false;
@tracked helpSeen = false;
@tracked offerHelp;
@ -24,9 +25,9 @@ export default class ForgotPassword extends Component {
if (this.disabled) {
return true;
} else if (this.siteSettings.hide_email_address_taken) {
return !(this.emailOrUsername || "").includes("@");
return !this.emailOrUsername.includes("@");
} else {
return isEmpty((this.emailOrUsername || "").trim());
return isEmpty(this.emailOrUsername.trim());
}
}