zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-24 19:48:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

ruby syntaxt upadtes #2557

Browse source
This commit is contained in:
Priit Tark 2015-06-16 22:35:40 +03:00
parent 1b66e74108
commit 9c43e8e302
5 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/devise_custom_failure.rb
View file

@ -2,7 +2,7 @@ class DeviseCustomFailure < Devise::FailureApp
def redirect_url
return registrant_login_url if request.original_fullpath.to_s.match(/^\/registrant/)
return registrar_login_url if request.original_fullpath.to_s.match(/^\/registrar/)
return '/admin' if request.original_fullpath.to_s.match(/^\/admin\/que/)
return '/admin' if request.original_fullpath.to_s.match(%r{^\/admin\/que})
return admin_login_url if request.original_fullpath.to_s.match(/^\/admin/)
root_url
end

6
lib/tasks/import.rake
View file

@ -235,6 +235,7 @@ namespace :import do
legacy_contact_id
)
# rubocop: disable Lint/UselessAssignment
domain_status_columns = %w(
description
value
@ -242,6 +243,7 @@ namespace :import do
updator_str
legacy_domain_id
)
# rubocop: enable Lint/UselessAssignment
nameserver_columns = %w(
hostname
@ -292,9 +294,7 @@ namespace :import do
end
# OK status is default
if ok
domain_statuses << DomainStatus::OK
end
domain_statuses << DomainStatus::OK if ok
domains << [
x.object_registry.name.try(:strip),