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

fixed codeclimate errors

Browse source
This commit is contained in:
dinsmol 2021-09-10 11:46:21 +03:00
parent 2f81e856fc
commit e345abc2fc
4 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/application_helper.rb
View file

@ -110,7 +110,7 @@ module ApplicationHelper
end end
def verified_email_span(verification) def verified_email_span(verification)
content_tag(:span, verification.email, class: verified_email_class(verification)) tag.span(verification.email, class: verified_email_class(verification))
end end
def verified_email_class(verification) def verified_email_class(verification)

6
app/models/concerns/domain/force_delete.rb
View file

@ -5,6 +5,9 @@ module Domain::ForceDelete
DomainStatus::SERVER_RENEW_PROHIBITED, DomainStatus::SERVER_RENEW_PROHIBITED,
DomainStatus::SERVER_TRANSFER_PROHIBITED].freeze DomainStatus::SERVER_TRANSFER_PROHIBITED].freeze
HOLD_STATUSES = [DomainStatus::SERVER_HOLD,
DomainStatus::CLIENT_HOLD].freeze
included do included do
store_accessor :force_delete_data, store_accessor :force_delete_data,
:force_delete_type, :force_delete_type,
@ -15,9 +18,6 @@ module Domain::ForceDelete
lambda { lambda {
where("(force_delete_data->>'contact_notification_sent_date') is null") where("(force_delete_data->>'contact_notification_sent_date') is null")
} }
HOLD_STATUSES = [DomainStatus::SERVER_HOLD,
DomainStatus::CLIENT_HOLD].freeze
end end
class_methods do class_methods do

24
app/presenters/domain_presenter.rb
View file

@ -10,12 +10,12 @@ class DomainPresenter
html = domain.name html = domain.name
if domain.discarded? if domain.discarded?
label = view.content_tag(:span, 'deleteCandidate', class: 'label label-warning') label = view.tag.span('deleteCandidate', class: 'label label-warning')
html += " #{label}" html += " #{label}"
end end
if domain.locked_by_registrant? if domain.locked_by_registrant?
label = view.content_tag(:span, 'registryLock', class: 'label label-danger') label = view.tag.span('registryLock', class: 'label label-danger')
html += " #{label}" html += " #{label}"
end end
@ -78,12 +78,12 @@ class DomainPresenter
private private
def schedule_force_delete_btn def schedule_force_delete_btn
view.content_tag(:a, view.t('admin.domains.force_delete_toggle_btn.schedule'), view.tag.a(view.t('admin.domains.force_delete_toggle_btn.schedule'),
class: 'dropdown-item', class: 'dropdown-item',
data: { data: {
toggle: 'modal', toggle: 'modal',
target: '.domain-edit-force-delete-dialog', target: '.domain-edit-force-delete-dialog',
}) })
end end
def cancel_force_delete_btn def cancel_force_delete_btn
@ -97,10 +97,10 @@ class DomainPresenter
end end
def inactive_schedule_force_delete_btn def inactive_schedule_force_delete_btn
view.content_tag :button, view.t('admin.domains.force_delete_toggle_btn.schedule'), view.tag.button(view.t('admin.domains.force_delete_toggle_btn.schedule'),
title: view.t('admin.domains.force_delete_toggle_btn.unable_to_schedule'), title: view.t('admin.domains.force_delete_toggle_btn.unable_to_schedule'),
disabled: true, disabled: true,
class: 'dropdown-item' class: 'dropdown-item')
end end
attr_reader :domain, :view attr_reader :domain, :view

7
app/validators/contact/ident/birth_date_validator.rb
View file

@ -1,7 +1,4 @@
class Contact::Ident::BirthDateValidator < ActiveModel::Validator class Contact::Ident::BirthDateValidator < ActiveModel::Validator
VALID_BIRTH_DATE_FROM = Time.zone.today - 150.years
VALID_BIRTH_DATE_TO = Time.zone.tomorrow
def validate(record) def validate(record)
record.errors.add(:code, :invalid_birth_date) if birth_date_wrong?(record) record.errors.add(:code, :invalid_birth_date) if birth_date_wrong?(record)
end end
@ -18,7 +15,9 @@ class Contact::Ident::BirthDateValidator < ActiveModel::Validator
end end
contact_ident_date = Date.parse(record.code) contact_ident_date = Date.parse(record.code)
valid_time_range = VALID_BIRTH_DATE_FROM...VALID_BIRTH_DATE_TO date_from = Time.zone.today - 150.years
date_to = Time.zone.tomorrow
valid_time_range = date_from...date_to
return if valid_time_range.cover?(contact_ident_date) return if valid_time_range.cover?(contact_ident_date)
true true