hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-08 19:11:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'badibouteraa-master' into devel

Browse source
This commit is contained in:
Sacha Greif 2015-07-02 10:25:03 +09:00
commit 0b4e4702ed
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/telescope-invites/lib/client/templates/user_invites.js
View file

@ -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)

2
packages/telescope-invites/lib/server/invites.js
View file

@ -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)){

2
packages/telescope-releases/releases/0.21.1.md
View file

@ -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.