Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-03 03:46:19 +01:00
Code Issues Packages Projects Releases Activity

use "do end" instead of {} at ApplicationController

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20142 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2020-10-11 12:57:39 +00:00
parent d55582dccf
commit 834bc11cc9
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/controllers/application_controller.rb
View File

@@ -259,23 +259,23 @@ class ApplicationController < ActionController::Base
url = url_for(:controller => params[:controller], :action => params[:action], :id => params[:id], :project_id => params[:project_id])
end
respond_to do |format|
format.html {
format.html do
if request.xhr?
head :unauthorized
else
redirect_to signin_path(:back_url => url)
end
}
format.any(:atom, :pdf, :csv) {
end
format.any(:atom, :pdf, :csv) do
redirect_to signin_path(:back_url => url)
}
format.api {
end
format.api do
if Setting.rest_api_enabled? && accept_api_auth?
head(:unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"')
else
head(:forbidden)
end
}
end
format.js { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
format.any { head :unauthorized }
end
@@ -562,9 +562,9 @@ class ApplicationController < ActionController::Base
@status = arg[:status] || 500
respond_to do |format|
format.html {
format.html do
render :template => 'common/error', :layout => use_layout, :status => @status
}
end
format.any { head @status }
end
end
@@ -675,13 +675,13 @@ class ApplicationController < ActionController::Base
tmp = []
if value
parts = value.split(/,\s*/)
parts.each {|part|
parts.each do |part|
if m = %r{^([^\s,]+?)(?:;\s*q=(\d+(?:\.\d+)?))?$}.match(part)
val = m[1]
q = (m[2] or 1).to_f
tmp.push([val, q])
end
}
end
tmp = tmp.sort_by{|val, q| -q}
tmp.collect!{|val, q| val}
end