diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-04 20:44:43 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-04 20:44:43 -0400 |
| commit | 38d6960be1efdb6345445ab293a8cd605193785f (patch) | |
| tree | df37e79b5744b570aded5aa4d7fe38cd772a49fe /app/controllers/application_controller.rb | |
| parent | bcfa571b0328a4b3e94479a31c027621ceb86ad5 (diff) | |
| parent | d14dcf9af11a0f2eab2609efb7d9e59a9cc18bb0 (diff) | |
Merge branch 'master' into luke
Conflicts:
app/controllers/application_controller.rb
app/controllers/tournaments_controller.rb
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 85fc5b0..d5752aa 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -11,6 +11,8 @@ class ApplicationController < ActionController::Base #include sessionhelper for the session controller and view include SessionsHelper + include SimpleCaptcha::ControllerHelpers + def check_permission(verb, object=nil) unless current_user.can?((verb.to_s+"_"+noun).to_sym) or (!object.nil? and is_owner?(object)) respond_to do |format| |