Fix new rubocop warnings
This commit is contained in:
parent
0af8b95b7d
commit
1f880528bd
4 changed files with 16 additions and 13 deletions
|
@ -92,14 +92,14 @@ module Api
|
|||
result = putway(renumberednodes, *args)
|
||||
result[4] = renumberednodes.reject { |k, _v| orn.key?(k) }
|
||||
renumberedways[result[2]] = result[3] if result[0].zero? && result[2] != result[3]
|
||||
when "putrelation" then
|
||||
when "putrelation"
|
||||
result = putrelation(renumberednodes, renumberedways, *args)
|
||||
when "deleteway" then
|
||||
when "deleteway"
|
||||
result = deleteway(*args)
|
||||
when "putpoi" then
|
||||
result = putpoi(*args)
|
||||
renumberednodes[result[2]] = result[3] if result[0].zero? && result[2] != result[3]
|
||||
when "startchangeset" then
|
||||
when "startchangeset"
|
||||
result = startchangeset(*args)
|
||||
end
|
||||
|
||||
|
|
|
@ -52,12 +52,15 @@ class ReportsController < ApplicationController
|
|||
|
||||
def default_assigned_role
|
||||
case issue_params[:reportable_type]
|
||||
when "Note" then "moderator"
|
||||
when "User" then case report_params[:category]
|
||||
when "Note"
|
||||
"moderator"
|
||||
when "User"
|
||||
case report_params[:category]
|
||||
when "vandal" then "moderator"
|
||||
else "administrator"
|
||||
end
|
||||
else "administrator"
|
||||
else
|
||||
"administrator"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -520,11 +520,11 @@ class UsersController < ApplicationController
|
|||
|
||||
if user
|
||||
case user.status
|
||||
when "pending" then
|
||||
when "pending"
|
||||
unconfirmed_login(user)
|
||||
when "active", "confirmed" then
|
||||
when "active", "confirmed"
|
||||
successful_login(user, request.env["omniauth.params"]["referer"])
|
||||
when "suspended" then
|
||||
when "suspended"
|
||||
failed_login t("users.login.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe
|
||||
else
|
||||
failed_login t("users.login.auth failure")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue