diff --git a/packages/telescope-invites/lib/client/templates/user_invites.js b/packages/telescope-invites/lib/client/templates/user_invites.js index de98b8570..ad0fc7967 100644 --- a/packages/telescope-invites/lib/client/templates/user_invites.js +++ b/packages/telescope-invites/lib/client/templates/user_invites.js @@ -15,11 +15,11 @@ Template.user_invites.created = function () { Template.user_invites.helpers({ canCurrentUserInvite: function () { var currentUser = Meteor.user(); - return currentUser && (Users.is.admin(currentUser) || currentUser.inviteCount > 0 && Users.can.invite(currentUser)); + return currentUser && (Users.is.admin(currentUser) || currentUser.telescope.inviteCount > 0 && Users.can.invite(currentUser)); }, invitesLeft: function () { var currentUser = Meteor.user(); - return currentUser ? currentUser.inviteCount : 0; + return (currentUser && !(Users.is.admin(currentUser))) ? (currentUser.telescope.inviteCount - currentUser.telescope.invitedCount) : 0 }, invitesSchema: function () { // expose schema for Invites (used by AutoForm) diff --git a/packages/telescope-invites/lib/server/invites.js b/packages/telescope-invites/lib/server/invites.js index 160793daf..a2a2a8ddf 100644 --- a/packages/telescope-invites/lib/server/invites.js +++ b/packages/telescope-invites/lib/server/invites.js @@ -21,7 +21,7 @@ Meteor.methods({ var userEmail = invitation.invitedUserEmail ? invitation.invitedUserEmail :Users.getEmail(user); var currentUser = Meteor.user(); var currentUserIsAdmin = Users.is.admin(currentUser); - var currentUserCanInvite = currentUserIsAdmin || (currentUser.inviteCount > 0 && Users.can.invite(currentUser)); + var currentUserCanInvite = currentUserIsAdmin || (currentUser.telescope.inviteCount > 0 && Users.can.invite(currentUser)); // check if the person is already invited if(user && Users.is.invited(user)){ diff --git a/packages/telescope-releases/releases/0.21.1.md b/packages/telescope-releases/releases/0.21.1.md index a2923f336..9d7add764 100644 --- a/packages/telescope-releases/releases/0.21.1.md +++ b/packages/telescope-releases/releases/0.21.1.md @@ -1,4 +1,4 @@ -### v0.21 “SlugScope” +### v0.21.1 “SlugScope” * Added URL slugs for posts (i.e. `/posts/xyz/my-post-slug`). * i18n files clean-up.