From 5e70825c9426783132dedff071d24c3ec42298d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alberto=20Fern=C3=A1ndez=20Capel?=
<alberto.fernandez-capel@overleaf.com>
Date: Thu, 7 Jun 2018 14:10:01 +0100
Subject: [PATCH] Rename view variable to invite
Makes the meaning more explicit
---
.../Features/Subscription/SubscriptionGroupHandler.coffee | 4 ++--
.../coffee/Features/Subscription/TeamInvitesController.coffee | 2 +-
services/web/app/views/subscriptions/group_admin.pug | 4 ++--
services/web/public/coffee/main/group-members.coffee | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/services/web/app/coffee/Features/Subscription/SubscriptionGroupHandler.coffee b/services/web/app/coffee/Features/Subscription/SubscriptionGroupHandler.coffee
index 619ee49351..2744a7786a 100644
--- a/services/web/app/coffee/Features/Subscription/SubscriptionGroupHandler.coffee
+++ b/services/web/app/coffee/Features/Subscription/SubscriptionGroupHandler.coffee
@@ -76,12 +76,12 @@ buildUserViewModel = (user)->
email: user.email
first_name: user.first_name
last_name: user.last_name
- holdingAccount: user.holdingAccount
+ invite: user.holdingAccount
_id: user._id
return u
buildEmailInviteViewModel = (email) ->
return {
email: email
- holdingAccount: true
+ invite: true
}
diff --git a/services/web/app/coffee/Features/Subscription/TeamInvitesController.coffee b/services/web/app/coffee/Features/Subscription/TeamInvitesController.coffee
index 565cdffcf1..4d858fa6f6 100644
--- a/services/web/app/coffee/Features/Subscription/TeamInvitesController.coffee
+++ b/services/web/app/coffee/Features/Subscription/TeamInvitesController.coffee
@@ -13,7 +13,7 @@ module.exports =
TeamInvitesHandler.createManagerInvite teamManagerId, email, (err, invite) ->
return handleError(err, req, res, next) if err?
inviteView = { user:
- { email: invite.email, sentAt: invite.sentAt, holdingAccount: true }
+ { email: invite.email, sentAt: invite.sentAt, invite: true }
}
res.json inviteView
diff --git a/services/web/app/views/subscriptions/group_admin.pug b/services/web/app/views/subscriptions/group_admin.pug
index 3fe93f3b94..194cd090fa 100644
--- a/services/web/app/views/subscriptions/group_admin.pug
+++ b/services/web/app/views/subscriptions/group_admin.pug
@@ -49,8 +49,8 @@ block content
span.name {{ user.first_name }} {{ user.last_name }}
.col-md-2
span.registered
- i.fa.fa-check.text-success(ng-show="!user.holdingAccount")
- i.fa.fa-times(ng-show="user.holdingAccount")
+ i.fa.fa-check.text-success(ng-show="!user.invite")
+ i.fa.fa-times(ng-show="user.invite")
li(
ng-if="users.length == 0",
ng-cloak
diff --git a/services/web/public/coffee/main/group-members.coffee b/services/web/public/coffee/main/group-members.coffee
index 1d7e7ff104..028639c741 100644
--- a/services/web/public/coffee/main/group-members.coffee
+++ b/services/web/public/coffee/main/group-members.coffee
@@ -34,7 +34,7 @@ define [
$scope.removeMembers = () ->
for user in $scope.selectedUsers
do (user) ->
- if user.holdingAccount and !user._id?
+ if user.invite and !user._id?
url = "/subscription/invites/#{encodeURIComponent(user.email)}"
else
url = "/subscription/group/user/#{user._id}"