From 71911a4c67e325bb83a3ef9f2641ec6dd8a93fbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Fri, 4 Mar 2016 10:52:23 +0100
Subject: [PATCH] fix build
---
.../javascripts/discourse/controllers/create-account.js.es6 | 4 ++--
test/javascripts/controllers/create-account-test.js.es6 | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index 5b0864df783..8d070589905 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6
@@ -72,7 +72,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
}.property('authOptions.auth_provider'),
passwordInstructions: function() {
- 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});
+ 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});
}.property('isDeveloper'),
nameInstructions: function() {
@@ -285,7 +285,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
}
// If too short
- const passwordLength = this.get('isDeveloper') ? this.siteSettings.min_admin_password_length : this.siteSettings.min_password_length;
+ const passwordLength = this.get('isDeveloper') ? Discourse.SiteSettings.min_admin_password_length : Discourse.SiteSettings.min_password_length;
if (password.length < passwordLength) {
return Discourse.InputValidation.create({
failed: true,
diff --git a/test/javascripts/controllers/create-account-test.js.es6 b/test/javascripts/controllers/create-account-test.js.es6
index 4c202880aa0..0f7284be6f4 100644
--- a/test/javascripts/controllers/create-account-test.js.es6
+++ b/test/javascripts/controllers/create-account-test.js.es6
@@ -28,11 +28,11 @@ test('passwordValidation', function() {
var controller = subject();
controller.set('passwordRequired', true);
- controller.set('accountEmail', 'pork@chops.com');
- controller.set('accountUsername', 'porkchops');
+ controller.set('accountEmail', 'pork@chops.com');
+ controller.set('accountUsername', 'porkchops');
controller.set('prefilledUsername', 'porkchops');
- controller.set('accountPassword', 'b4fcdae11f9167');
+ controller.set('accountPassword', 'b4fcdae11f9167');
equal(controller.get('passwordValidation.ok'), true, 'Password is ok');
equal(controller.get('passwordValidation.reason'), I18n.t('user.password.ok'), 'Password is valid');