+ {{#constant}}
{{message}}
+ {{/constant}}
{{/if}}
diff --git a/client/views/common/error.js b/client/views/common/error.js
index e68cef7c0..ea9bc8208 100644
--- a/client/views/common/error.js
+++ b/client/views/common/error.js
@@ -1,6 +1,22 @@
Template.error.message= function(){
- return Session.get("error");
+ var outerContext = Meteor.deps.Context.current;
+ var innerContext = new Meteor.deps.Context;
+ var error;
+
+ innerContext.onInvalidate(function() {
+ // we don't need to send the invalidate through anymore if post is set
+ error || outerContext.invalidate();
+ });
+
+ innerContext.run(function() {
+ error = Session.get("error");
+ });
+
+ return error;
}
Template.error.rendered = function(){
+ Meteor.setTimeout(function(){
+ Session.set("error", null);
+ }, 100);
}
\ No newline at end of file
diff --git a/client/views/posts/post_edit.js b/client/views/posts/post_edit.js
index c22983ee9..674315bc8 100644
--- a/client/views/posts/post_edit.js
+++ b/client/views/posts/post_edit.js
@@ -26,7 +26,7 @@ Template.post_edit.helpers({
innerContext.run(function() {
post = Posts.findOne(Session.get('selectedPostId'));
- })
+ });
return post;
}
diff --git a/lib/users.js b/lib/users.js
index ab039221f..6d90822a7 100644
--- a/lib/users.js
+++ b/lib/users.js
@@ -48,61 +48,75 @@ userProfileComplete = function(user) {
// Permissions
-canView = function(user){
+// user: Defaults to Meteor.user()
+// redirect: Defaults to false. If false, the permission check will fail silently
+// If true, a failed permission check will throw an error message and redirect the user
+canView = function(user, redirect){
+ var user=(typeof user === 'undefined') ? Meteor.user() : user;
+ var redirect=(typeof redirect === 'undefined') ? false : redirect;
if(getSetting('requireViewInvite')==true){
+ try{
+ if(!user){
+ throw "no_account";
+ }else if(isAdmin(user) || user.isInvited){
+ return true;
+ }else{
+ throw "no_invite";
+ }
+ }catch(error){
+ if(redirect)
+ Router.goto(error);
+ return false;
+ }
+ }else{
+ return true;
+ }
+}
+canPost = function(user, redirect){
+ var user=(typeof user === 'undefined') ? Meteor.user() : user;
+ var redirect=(typeof redirect === 'undefined') ? false : redirect;
+ try{
if(!user){
- Router.goto('no_account');
- return false;
- }
- if(isAdmin(user))
- return true;
- if(user.isInvited){
+ throw "no_account";
+ }else if(isAdmin(user)){
return true;
+ }else if(getSetting('requirePostInvite')){
+ if(user.isInvited){
+ return true;
+ }else{
+ throw "no_invite";
+ }
}else{
- Router.goto('no_invite');
- return false;
+ return true;
}
-
- }
- return true;
-}
-canUpvote = function(user, collection){
- if(!user)
- return false
- if(isAdmin(user))
- return true;
- if(getSetting('requirePostInvite')==true){
- return user.isInvited;
- }
- return true;
-}
-canDownvote = function(user, collection){
- if(!user)
- return false
- if(isAdmin(user))
- return true;
- if(getSetting('requirePostInvite')==true){
- return user.isInvited;
- }
- return true;
-}
-canPost = function(user){
- if(!user)
- return false
- if(isAdmin(user))
- return true;
- if(getSetting('requirePostInvite')==true){
- return user.isInvited;
- }
- return true;
-}
-canComment = function(user){
- if(!user)
+ }catch(error){
+ if(redirect){
+ switch(error){
+ case "no_account":
+ throwError("Please sign in or create an account first.");
+ Router.goto('signin');
+ break;
+ case "no_invite":
+ throwError("Sorry, you need to have an invitation to do this.");
+ Router.goto("no_invite");
+ break;
+ }
+ }
return false;
- if(isAdmin(user))
- return true;
- if(getSetting('requirePostInvite')==true){
- return user.isInvited;
}
- return true;
+}
+canComment = function(user, redirect){
+ var user=(typeof user === 'undefined') ? Meteor.user() : user;
+ var redirect=(typeof redirect === 'undefined') ? false : redirect;
+ return canPost(user, redirect);
+}
+canUpvote = function(user, collection, redirect){
+ var user=(typeof user === 'undefined') ? Meteor.user() : user;
+ var redirect=(typeof redirect === 'undefined') ? false : redirect;
+ return canPost(user, redirect);
+}
+canDownvote = function(user, collection, redirect){
+ var user=(typeof user === 'undefined') ? Meteor.user() : user;
+ var redirect=(typeof redirect === 'undefined') ? false : redirect;
+ return canPost(user, redirect);
}
\ No newline at end of file