mirror of
https://github.com/internetee/registry.git
synced 2025-07-21 18:26:06 +02:00
fixed codeclimate errors
This commit is contained in:
parent
2f81e856fc
commit
e345abc2fc
4 changed files with 19 additions and 20 deletions
|
@ -110,7 +110,7 @@ module ApplicationHelper
|
|||
end
|
||||
|
||||
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
|
||||
|
||||
def verified_email_class(verification)
|
||||
|
|
|
@ -5,6 +5,9 @@ module Domain::ForceDelete
|
|||
DomainStatus::SERVER_RENEW_PROHIBITED,
|
||||
DomainStatus::SERVER_TRANSFER_PROHIBITED].freeze
|
||||
|
||||
HOLD_STATUSES = [DomainStatus::SERVER_HOLD,
|
||||
DomainStatus::CLIENT_HOLD].freeze
|
||||
|
||||
included do
|
||||
store_accessor :force_delete_data,
|
||||
:force_delete_type,
|
||||
|
@ -15,9 +18,6 @@ module Domain::ForceDelete
|
|||
lambda {
|
||||
where("(force_delete_data->>'contact_notification_sent_date') is null")
|
||||
}
|
||||
|
||||
HOLD_STATUSES = [DomainStatus::SERVER_HOLD,
|
||||
DomainStatus::CLIENT_HOLD].freeze
|
||||
end
|
||||
|
||||
class_methods do
|
||||
|
|
|
@ -10,12 +10,12 @@ class DomainPresenter
|
|||
html = domain.name
|
||||
|
||||
if domain.discarded?
|
||||
label = view.content_tag(:span, 'deleteCandidate', class: 'label label-warning')
|
||||
label = view.tag.span('deleteCandidate', class: 'label label-warning')
|
||||
html += " #{label}"
|
||||
end
|
||||
|
||||
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}"
|
||||
end
|
||||
|
||||
|
@ -78,12 +78,12 @@ class DomainPresenter
|
|||
private
|
||||
|
||||
def schedule_force_delete_btn
|
||||
view.content_tag(:a, view.t('admin.domains.force_delete_toggle_btn.schedule'),
|
||||
class: 'dropdown-item',
|
||||
data: {
|
||||
toggle: 'modal',
|
||||
target: '.domain-edit-force-delete-dialog',
|
||||
})
|
||||
view.tag.a(view.t('admin.domains.force_delete_toggle_btn.schedule'),
|
||||
class: 'dropdown-item',
|
||||
data: {
|
||||
toggle: 'modal',
|
||||
target: '.domain-edit-force-delete-dialog',
|
||||
})
|
||||
end
|
||||
|
||||
def cancel_force_delete_btn
|
||||
|
@ -97,10 +97,10 @@ class DomainPresenter
|
|||
end
|
||||
|
||||
def inactive_schedule_force_delete_btn
|
||||
view.content_tag :button, view.t('admin.domains.force_delete_toggle_btn.schedule'),
|
||||
title: view.t('admin.domains.force_delete_toggle_btn.unable_to_schedule'),
|
||||
disabled: true,
|
||||
class: 'dropdown-item'
|
||||
view.tag.button(view.t('admin.domains.force_delete_toggle_btn.schedule'),
|
||||
title: view.t('admin.domains.force_delete_toggle_btn.unable_to_schedule'),
|
||||
disabled: true,
|
||||
class: 'dropdown-item')
|
||||
end
|
||||
|
||||
attr_reader :domain, :view
|
||||
|
|
|
@ -1,7 +1,4 @@
|
|||
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)
|
||||
record.errors.add(:code, :invalid_birth_date) if birth_date_wrong?(record)
|
||||
end
|
||||
|
@ -18,7 +15,9 @@ class Contact::Ident::BirthDateValidator < ActiveModel::Validator
|
|||
end
|
||||
|
||||
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)
|
||||
|
||||
true
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue