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

FIX: Don't skip TOS check when using 3rd party auth

This commit is contained in:
Robin Ward 2014-08-21 16:23:02 -04:00
parent c1aa2458f8
commit dd84b9d79f
1 changed files with 3 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

@ -37,9 +37,11 @@ export default DiscourseController.extend(ModalFunctionality, {
}, },
submitDisabled: function() { submitDisabled: function() {
// Even if password is required, we respect the tos setting
if (this.get('tosAcceptRequired') && !this.get('tosAccepted')) return true;
if (!this.get('passwordRequired')) return false; // 3rd party auth if (!this.get('passwordRequired')) return false; // 3rd party auth
if (this.get('formSubmitted')) return true; if (this.get('formSubmitted')) return true;
if (this.get('tosAcceptRequired') && !this.get('tosAccepted')) return true;
if (this.get('nameValidation.failed')) return true; if (this.get('nameValidation.failed')) return true;
if (this.get('emailValidation.failed')) return true; if (this.get('emailValidation.failed')) return true;
if (this.get('usernameValidation.failed')) return true; if (this.get('usernameValidation.failed')) return true;