| @@ -22,7 +22,7 class Unauthorized < Exception; end | |||||
| 22 |
|
22 | |||
| 23 | class ApplicationController < ActionController::Base |
|
23 | class ApplicationController < ActionController::Base | |
| 24 | include Redmine::I18n |
|
24 | include Redmine::I18n | |
| 25 |
|
25 | |||
| 26 | class_attribute :accept_api_auth_actions |
|
26 | class_attribute :accept_api_auth_actions | |
| 27 | class_attribute :accept_rss_auth_actions |
|
27 | class_attribute :accept_rss_auth_actions | |
| 28 | class_attribute :model_object |
|
28 | class_attribute :model_object | |
| @@ -90,7 +90,7 class ApplicationController < ActionController::Base | |||||
| 90 | def find_current_user |
|
90 | def find_current_user | |
| 91 | user = nil |
|
91 | user = nil | |
| 92 | unless api_request? |
|
92 | unless api_request? | |
| 93 |
if session[:user_id] |
|
93 | if session[:user_id] | |
| 94 | # existing session |
|
94 | # existing session | |
| 95 | user = (User.active.find(session[:user_id]) rescue nil) |
|
95 | user = (User.active.find(session[:user_id]) rescue nil) | |
| 96 | elsif autologin_user = try_to_autologin |
|
96 | elsif autologin_user = try_to_autologin | |
General Comments 0
You need to be logged in to leave comments.
Login now