From cb095e966307b2feb5a6c3fec6438efcae98cc6b Mon Sep 17 00:00:00 2001 From: Sacha Greif Date: Wed, 1 Jul 2015 15:58:03 +0900 Subject: [PATCH 1/4] 0.21 -> 0.21.1 --- packages/telescope-releases/releases/0.21.1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. From e5e5606e0c17209563d82654e2202fdbb977fac3 Mon Sep 17 00:00:00 2001 From: badibouteraa Date: Thu, 2 Jul 2015 00:12:16 +0100 Subject: [PATCH 2/4] Update invites.js Fixing the user's CanInvite bug --- packages/telescope-invites/lib/server/invites.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)){ From f315cd0822c653184a59c36339902f79d1674c81 Mon Sep 17 00:00:00 2001 From: badibouteraa Date: Thu, 2 Jul 2015 00:14:01 +0100 Subject: [PATCH 3/4] Fixing the user's CanInvite bug --- .../telescope-invites/lib/client/templates/user_invites.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/telescope-invites/lib/client/templates/user_invites.js b/packages/telescope-invites/lib/client/templates/user_invites.js index de98b8570..42a5f0d78 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 ? currentUser.telescope.inviteCount : 0; }, invitesSchema: function () { // expose schema for Invites (used by AutoForm) From 2f8c184c0c260aa8e51975a25c590f92cce34f8f Mon Sep 17 00:00:00 2001 From: badibouteraa Date: Thu, 2 Jul 2015 00:43:34 +0100 Subject: [PATCH 4/4] Fix user's left invites --- packages/telescope-invites/lib/client/templates/user_invites.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/telescope-invites/lib/client/templates/user_invites.js b/packages/telescope-invites/lib/client/templates/user_invites.js index 42a5f0d78..ad0fc7967 100644 --- a/packages/telescope-invites/lib/client/templates/user_invites.js +++ b/packages/telescope-invites/lib/client/templates/user_invites.js @@ -19,7 +19,7 @@ Template.user_invites.helpers({ }, invitesLeft: function () { var currentUser = Meteor.user(); - return currentUser ? currentUser.telescope.inviteCount : 0; + return (currentUser && !(Users.is.admin(currentUser))) ? (currentUser.telescope.inviteCount - currentUser.telescope.invitedCount) : 0 }, invitesSchema: function () { // expose schema for Invites (used by AutoForm)