cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix new rubocop warnings

Browse source
This commit is contained in:
Tom Hughes 2019-07-18 16:43:11 +01:00
parent 0af8b95b7d
commit 1f880528bd
4 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/api/amf_controller.rb
View file

@ -92,14 +92,14 @@ module Api
result = putway(renumberednodes, *args) result = putway(renumberednodes, *args)
result[4] = renumberednodes.reject { |k, _v| orn.key?(k) } result[4] = renumberednodes.reject { |k, _v| orn.key?(k) }
renumberedways[result[2]] = result[3] if result[0].zero? && result[2] != result[3] renumberedways[result[2]] = result[3] if result[0].zero? && result[2] != result[3]
when "putrelation" then when "putrelation"
result = putrelation(renumberednodes, renumberedways, *args) result = putrelation(renumberednodes, renumberedways, *args)
when "deleteway" then when "deleteway"
result = deleteway(*args) result = deleteway(*args)
when "putpoi" then when "putpoi" then
result = putpoi(*args) result = putpoi(*args)
renumberednodes[result[2]] = result[3] if result[0].zero? && result[2] != result[3] renumberednodes[result[2]] = result[3] if result[0].zero? && result[2] != result[3]
when "startchangeset" then when "startchangeset"
result = startchangeset(*args) result = startchangeset(*args)
end end

9
app/controllers/reports_controller.rb
View file

@ -52,12 +52,15 @@ class ReportsController < ApplicationController
def default_assigned_role def default_assigned_role
case issue_params[:reportable_type] case issue_params[:reportable_type]
when "Note" then "moderator" when "Note"
when "User" then case report_params[:category] "moderator"
when "User"
case report_params[:category]
when "vandal" then "moderator" when "vandal" then "moderator"
else "administrator" else "administrator"
end end
else "administrator" else
"administrator"
end end
end end
end end

6
app/controllers/users_controller.rb
View file

@ -520,11 +520,11 @@ class UsersController < ApplicationController
if user if user
case user.status case user.status
when "pending" then when "pending"
unconfirmed_login(user) unconfirmed_login(user)
when "active", "confirmed" then when "active", "confirmed"
successful_login(user, request.env["omniauth.params"]["referer"]) 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 failed_login t("users.login.account is suspended", :webmaster => "mailto:#{Settings.support_email}").html_safe
else else
failed_login t("users.login.auth failure") failed_login t("users.login.auth failure")