diff --git a/src/js/yunohost/controllers/users.js b/src/js/yunohost/controllers/users.js index f2d2f49e..cbc4999d 100644 --- a/src/js/yunohost/controllers/users.js +++ b/src/js/yunohost/controllers/users.js @@ -3,6 +3,8 @@ var app = Sammy.apps['#main']; var store = app.store; + var PASSWORD_MIN_LENGTH = 4; + /** * Users * @@ -18,6 +20,10 @@ // Create user form app.get('#/users/create', function (c) { c.api('/domains', function(data) { // http://api.yunohost.org/#!/domain/domain_list_get_2 + + // Password min length + data.password_min_length = PASSWORD_MIN_LENGTH; + c.view('user/user_create', data); }); }); @@ -25,7 +31,7 @@ // Create user (POST) app.post('#/users/create', function (c) { if (c.params['password'] == c.params['confirmation']) { - if (c.params['password'].length < 4) { + if (c.params['password'].length < PASSWORD_MIN_LENGTH) { c.flash('fail', y18n.t('password_too_short')); store.clear('slide'); } @@ -62,6 +68,9 @@ c.api('/users/'+ c.params['user'], function(data) { // http://api.yunohost.org/#!/user/user_info_get_0 c.api('/domains', function(dataDomains) { // http://api.yunohost.org/#!/domain/domain_list_get_2 + // Password min length + data.password_min_length = PASSWORD_MIN_LENGTH; + // User email use a fake splitted field email = data.mail.split('@'); data.email = { @@ -152,7 +161,7 @@ } else { if (params['password']) { if (params['password'] == params['confirmation']) { - if (params['password'].length < 4) { + if (params['password'].length < PASSWORD_MIN_LENGTH) { c.flash('fail', y18n.t('password_too_short')); store.clear('slide'); c.redirect('#/users/'+ c.params['user'] + '/edit'); diff --git a/src/locales/en.json b/src/locales/en.json index 61723aa5..2e2de074 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -5,7 +5,7 @@ "administration_password" : "Administration password", "password_confirmation" : "Password confirmation", "password_new" : "New password", - "password_description" : "Password must be at least 4 characters long.", + "password_description" : "Password must be at least %s characters long.", "login" : "Login", "logout" : "Logout", "loading" : "Loading …", diff --git a/src/views/user/user_create.ms b/src/views/user/user_create.ms index 1a8be136..df01e25c 100644 --- a/src/views/user/user_create.ms +++ b/src/views/user/user_create.ms @@ -65,7 +65,7 @@