Rename user.isActivated

js/src/common/models/User.js

@@ -12,7 +12,7 @@ Object.assign(User.prototype, {
   username: Model.attribute('username'),
   displayName: Model.attribute('displayName'),
   email: Model.attribute('email'),
-  isActivated: Model.attribute('isActivated'),
+  isEmailConfirmed: Model.attribute('isEmailConfirmed'),
   password: Model.attribute('password'),
 
   avatarUrl: Model.attribute('avatarUrl'),

js/src/forum/components/EditUserModal.js

@@ -15,7 +15,7 @@ export default class EditUserModal extends Modal {
 
     this.username = m.prop(user.username() || '');
     this.email = m.prop(user.email() || '');
-    this.isActivated = m.prop(user.isActivated() || false);
+    this.isEmailConfirmed = m.prop(user.isEmailConfirmed() || false);
     this.setPassword = m.prop(false);
     this.password = m.prop(user.password() || '');
     this.groups = {};
@@ -50,7 +50,7 @@ export default class EditUserModal extends Modal {
                 <input className="FormControl" placeholder={extractText(app.translator.trans('core.forum.edit_user.email_label'))}
                   bidi={this.email} />
               </div>
-              {!this.isActivated() ? (
+              {!this.isEmailConfirmed() ? (
                 <div>
                   {Button.component({
                     className: 'Button Button--block',
@@ -115,11 +115,11 @@ export default class EditUserModal extends Modal {
     this.loading = true;
     const data = {
       username: this.username(),
-      isActivated: true,
+      isEmailConfirmed: true,
     };
     this.props.user.save(data, {errorHandler: this.onerror.bind(this)})
       .then(() => {
-        this.isActivated(true);
+        this.isEmailConfirmed(true);
         this.loading = false;
         m.redraw();
       })

js/src/forum/utils/alertEmailConfirmation.js

@@ -10,7 +10,7 @@ import icon from '../../common/helpers/icon';
 export default function alertEmailConfirmation(app) {
   const user = app.session.user;
 
-  if (!user || user.isActivated()) return;
+  if (!user || user.isEmailConfirmed()) return;
 
   const resendButton = Button.component({
     className: 'Button Button--link',