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

FIX: require full name at signup when display is suppressed and required

This commit is contained in:
Sam 2016-06-29 10:43:40 +10:00
parent 8fbcda5bf1
commit b4cb2e367c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,6 +67,10 @@ export default Ember.Controller.extend(ModalFunctionality, {
usernameRequired: Ember.computed.not('authOptions.omit_username'), usernameRequired: Ember.computed.not('authOptions.omit_username'),
fullnameRequired: function() {
return this.get('siteSettings.full_name_required') || this.get('siteSettings.enable_names');
}.property(),
passwordRequired: function() { passwordRequired: function() {
return Ember.isEmpty(this.get('authOptions.auth_provider')); return Ember.isEmpty(this.get('authOptions.auth_provider'));
}.property('authOptions.auth_provider'), }.property('authOptions.auth_provider'),

2
app/assets/javascripts/discourse/templates/modal/create-account.hbs
View File

@ -35,7 +35,7 @@
</tr> </tr>
{{/if}} {{/if}}
{{#if siteSettings.enable_names}} {{#if fullnameRequired}}
<tr class="input"> <tr class="input">
<td style="width:80px" class="label"> <td style="width:80px" class="label">
<label for='new-account-name'>{{i18n 'user.name.title'}}</label> <label for='new-account-name'>{{i18n 'user.name.title'}}</label>