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

code optimization

This commit is contained in:
Arpit Jalan 2016-03-04 01:12:41 +05:30
parent 36f82aa68c
commit 7ddb7ff429
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/javascripts/discourse/controllers/create-account.js.es6
View File

@ -72,7 +72,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
}.property('authOptions.auth_provider'), }.property('authOptions.auth_provider'),
passwordInstructions: function() { passwordInstructions: function() {
return this.get('isDeveloper') ? I18n.t('user.password.instructions', {count: Discourse.SiteSettings.min_admin_password_length}) : I18n.t('user.password.instructions', {count: Discourse.SiteSettings.min_password_length}); return this.get('isDeveloper') ? I18n.t('user.password.instructions', {count: this.siteSettings.min_admin_password_length}) : I18n.t('user.password.instructions', {count: this.siteSettings.min_password_length});
}.property('isDeveloper'), }.property('isDeveloper'),
nameInstructions: function() { nameInstructions: function() {
@ -284,16 +284,9 @@ export default Ember.Controller.extend(ModalFunctionality, {
return Discourse.InputValidation.create({ failed: true }); return Discourse.InputValidation.create({ failed: true });
} }
// If too short for Admin // If too short
if (this.get('isDeveloper') && password.length < Discourse.SiteSettings.min_admin_password_length) { const passwordLength = this.get('isDeveloper') ? this.siteSettings.min_admin_password_length : this.siteSettings.min_password_length;
return Discourse.InputValidation.create({ if (password.length < passwordLength) {
failed: true,
reason: I18n.t('user.password.too_short')
});
}
// If too short for normal user
if (!this.get('isDeveloper') && password.length < Discourse.SiteSettings.min_password_length) {
return Discourse.InputValidation.create({ return Discourse.InputValidation.create({
failed: true, failed: true,
reason: I18n.t('user.password.too_short') reason: I18n.t('user.password.too_short')