diff options
author | Christoph Helma <helma@in-silico.ch> | 2011-03-17 13:08:41 +0100 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2011-03-17 13:08:41 +0100 |
commit | 6edd281efdd33cf8842e79135bfd3b69d0949bce (patch) | |
tree | 1820d3296bb3f76a8acf41eb2601745ea0ca1a0b | |
parent | 95d6920fada55f7afd7a5c815e0d02a9dc83968b (diff) | |
parent | a799b1021f8da298f76aba6482f4ea35a3a1c67f (diff) |
Merge branch 'release/v1.0.3'v1.0.3
-rw-r--r-- | helper.rb | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -31,8 +31,10 @@ helpers do end def is_authorized(uri, action) - if session[:subjectid] != nil - return OpenTox::Authorization.authorize(uri, action, session[:subjectid]) + if OpenTox::Authorization.server && session[:subjectid] != nil + return OpenTox::Authorization.authorized?(uri, action, session[:subjectid]) + else + return true end return false end |