- Changed to use the correct setting

pull/7098/head
Luis Fernando do Nascimento 9 years ago
parent dbcba5634b
commit b10b887a93
  1. 6
      packages/rocketchat-ui-login/client/login/form.js

@ -60,9 +60,7 @@ Template.loginForm.helpers({
return typeof OnePassword !== 'undefined' && OnePassword.findLoginForUrl && typeof device !== 'undefined' && device.platform && device.platform.toLocaleLowerCase() === 'ios'; return typeof OnePassword !== 'undefined' && OnePassword.findLoginForUrl && typeof device !== 'undefined' && device.platform && device.platform.toLocaleLowerCase() === 'ios';
}, },
manuallyApproveNewUsers() { manuallyApproveNewUsers() {
//TODO verify why it' s not getting this setting return RocketChat.settings.get('Accounts_ManuallyApproveNewUsers');
//return RocketChat.settings.get('Accounts_ManuallyApproveNewUsers');
return true;
} }
}); });
@ -255,7 +253,7 @@ Template.loginForm.onCreated(function() {
if (RocketChat.settings.get('Accounts_RequirePasswordConfirmation') && formObj['confirm-pass'] !== formObj['pass']) { if (RocketChat.settings.get('Accounts_RequirePasswordConfirmation') && formObj['confirm-pass'] !== formObj['pass']) {
validationObj['confirm-pass'] = t('Invalid_confirm_pass'); validationObj['confirm-pass'] = t('Invalid_confirm_pass');
} }
if (true && !formObj['reason']) { if (RocketChat.settings.get('Accounts_ManuallyApproveNewUsers') && !formObj['reason']) {
validationObj['reason'] = t('Invalid_reason'); validationObj['reason'] = t('Invalid_reason');
} }
validateCustomFields(formObj, validationObj); validateCustomFields(formObj, validationObj);

Loading…
Cancel
Save