summaryrefslogtreecommitdiffstats
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2020-09-17 15:49:06 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2020-09-17 15:49:06 +0000
commitd7e881617d5aba3d884dfadd19149917dc37d68a (patch)
tree4d32a8c75d67f3bb1777d8f4e6003a182dd565ce /app/controllers/application_controller.rb
parent5e8af450c852e3439109d36ae9b6b2dd6f5eae6f (diff)
downloadredmine-d7e881617d5aba3d884dfadd19149917dc37d68a.tar.gz
redmine-d7e881617d5aba3d884dfadd19149917dc37d68a.zip
add empty line after guard clause to ApplicationController
git-svn-id: http://svn.redmine.org/redmine/trunk@20046 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 08dea30a7..c14b82108 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -194,6 +194,7 @@ class ApplicationController < ActionController::Base
def check_if_login_required
# no check needed if user is already logged in
return true if User.current.logged?
+
require_login if Setting.login_required?
end
@@ -285,6 +286,7 @@ class ApplicationController < ActionController::Base
def require_admin
return unless require_login
+
if !User.current.admin?
render_403
return false
@@ -375,6 +377,7 @@ class ApplicationController < ActionController::Base
# if the issue actually exists but requires authentication
@issue = Issue.find(params[:id])
raise Unauthorized unless @issue.visible?
+
@project = @issue.project
rescue ActiveRecord::RecordNotFound
render_404
@@ -391,6 +394,7 @@ class ApplicationController < ActionController::Base
to_a
raise ActiveRecord::RecordNotFound if @issues.empty?
raise Unauthorized unless @issues.all?(&:visible?)
+
@projects = @issues.collect(&:project).compact.uniq
@project = @projects.first if @projects.size == 1
rescue ActiveRecord::RecordNotFound
@@ -491,6 +495,7 @@ class ApplicationController < ActionController::Base
if uri.send(component).present? && uri.send(component) != request.send(component)
return false
end
+
uri.send(:"#{component}=", nil)
end
# Always ignore basic user:password in the URL
@@ -575,6 +580,7 @@ class ApplicationController < ActionController::Base
# but have no HTML representation for non admin users
def require_admin_or_api_request
return true if api_request?
+
if User.current.admin?
true
elsif User.current.logged?