FIX: better accept invite flow when user is invited via a link

This commit is contained in:
Arpit Jalan
2019-01-07 14:22:08 +05:30
parent 77d947701c
commit e0bc82657b
5 changed files with 18 additions and 14 deletions
@@ -94,8 +94,9 @@ export default Ember.Controller.extend(
"successMessage",
result.message || I18n.t("invites.success")
);
this.set("redirectTo", result.redirect_to);
DiscourseURL.redirectTo(result.redirect_to || "/");
if (result.redirect_to) {
DiscourseURL.redirectTo(result.redirect_to || "/");
}
} else {
if (
result.errors &&
@@ -8,13 +8,12 @@
</div>
<div class="col-form">
<p>{{i18n 'invites.invited_by'}}</p>
<p>{{user-info user=invitedBy}}</p>
{{#if successMessage}}
<p>{{successMessage}}</p>
<br/><br/>
<div class='alert alert-info'><p>{{{successMessage}}}</p></div>
{{else}}
<p>{{i18n 'invites.invited_by'}}</p>
<p>{{user-info user=invitedBy}}</p>
<p>{{{yourEmailMessage}}}
{{#if externalAuthsEnabled}}
@@ -63,7 +62,6 @@
<br/><br/>
<div class='alert alert-error'>{{errorMessage}}</div>
{{/if}}
</form>
{{/if}}
</div>