mirror of
https://github.com/internetee/registry.git
synced 2025-05-18 18:29:40 +02:00
Rubocop updates
This commit is contained in:
parent
17eec8e298
commit
7e340415e1
6 changed files with 9 additions and 4 deletions
|
@ -1,6 +1,7 @@
|
|||
class Admin::DomainVersionsController < AdminController
|
||||
load_and_authorize_resource
|
||||
|
||||
# rubocop:disable Style/GuardClause
|
||||
def index
|
||||
@domain = Domain.find(params[:domain_id])
|
||||
@versions = @domain.versions
|
||||
|
@ -11,6 +12,7 @@ class Admin::DomainVersionsController < AdminController
|
|||
@pending_domain = Epp::Domain.new_from_epp(frame, @pending_user)
|
||||
end
|
||||
end
|
||||
# rubocop:enable Style/GuardClause
|
||||
|
||||
# def index
|
||||
# # @q = DomainVersion.deleted.search(params[:q])
|
||||
|
|
|
@ -51,5 +51,4 @@ class Admin::PricelistsController < AdminController
|
|||
params.require(:pricelist).permit(:operation_category, :category, :price_category,
|
||||
:duration, :price, :valid_from, :valid_to)
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -48,7 +48,7 @@ module ApplicationHelper
|
|||
|
||||
def currency(amount)
|
||||
amount ||= 0
|
||||
("%01.2f" % amount.round(2)).sub(/\./, ',')
|
||||
format("%01.2f", amount.round(2)).sub(/\./, ',')
|
||||
end
|
||||
|
||||
def plain_username(username)
|
||||
|
|
|
@ -546,6 +546,7 @@ class Domain < ActiveRecord::Base
|
|||
self.delete_at = outzone_at + Setting.redemption_grace_period.days
|
||||
end
|
||||
|
||||
# rubocop:disable Metrics/AbcSize
|
||||
def set_force_delete
|
||||
self.statuses_backup = statuses
|
||||
statuses.delete(DomainStatus::CLIENT_DELETE_PROHIBITED)
|
||||
|
@ -572,6 +573,7 @@ class Domain < ActiveRecord::Base
|
|||
self.force_delete_at = Time.zone.now + Setting.redemption_grace_period.days unless force_delete_at
|
||||
save(validate: false)
|
||||
end
|
||||
# rubocop:enable Metrics/AbcSize
|
||||
|
||||
def unset_force_delete
|
||||
s = []
|
||||
|
|
|
@ -239,7 +239,7 @@ describe Domain do
|
|||
DomainStatus::CLIENT_HOLD,
|
||||
DomainStatus::EXPIRED,
|
||||
DomainStatus::SERVER_HOLD,
|
||||
DomainStatus::DELETE_CANDIDATE,
|
||||
DomainStatus::DELETE_CANDIDATE
|
||||
]
|
||||
|
||||
@domain.save
|
||||
|
|
|
@ -41,7 +41,9 @@ describe ZonefileSetting do
|
|||
|
||||
it 'should not place serverHold nor clientHold domains into zonefile' do
|
||||
Fabricate(:zonefile_setting)
|
||||
d = Fabricate(:domain_with_dnskeys, name: 'testzone.ee', statuses: ['serverHold', 'serverDeleteProhibited', 'clientHold'])
|
||||
d = Fabricate(:domain_with_dnskeys,
|
||||
name: 'testzone.ee',
|
||||
statuses: ['serverHold', 'serverDeleteProhibited', 'clientHold'])
|
||||
d.nameservers << Nameserver.new({
|
||||
hostname: "ns.#{d.name}",
|
||||
ipv4: '123.123.123.123',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue