From 9d7dc596525e08ea772d9e1eca11af66f3864b77 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Fri, 10 Aug 2018 14:43:06 +0300 Subject: [PATCH] Fix rubocop issues and a stray typo spotted along the way --- .../admin/domains/registry_lock_controller.rb | 7 ++++--- app/controllers/admin/mail_templates_controller.rb | 2 +- app/models/concerns/domain/lockable.rb | 14 +++++--------- app/presenters/domain_presenter.rb | 14 ++++++-------- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/app/controllers/admin/domains/registry_lock_controller.rb b/app/controllers/admin/domains/registry_lock_controller.rb index 83304fb72..6895ac711 100644 --- a/app/controllers/admin/domains/registry_lock_controller.rb +++ b/app/controllers/admin/domains/registry_lock_controller.rb @@ -1,14 +1,15 @@ module Admin module Domains class RegistryLockController < BaseController - def destroy set_domain authorize! :manage, @domain if @domain.remove_registry_lock - redirect_to edit_admin_domain_url(@domain), notice: t('admin.domains.registry_lock_delete.success') + redirect_to edit_admin_domain_url(@domain), + notice: t('admin.domains.registry_lock_delete.success') else - redirect_to edit_admin_domain_url(@domain), alert: t('admin.domains.registry_lock_delete.error') + redirect_to edit_admin_domain_url(@domain), + alert: t('admin.domains.registry_lock_delete.error') end end diff --git a/app/controllers/admin/mail_templates_controller.rb b/app/controllers/admin/mail_templates_controller.rb index 93141ade6..d7ec4e6d0 100644 --- a/app/controllers/admin/mail_templates_controller.rb +++ b/app/controllers/admin/mail_templates_controller.rb @@ -47,7 +47,7 @@ module Admin def destroy @mail_template = MailTemplate.find(params[:id]) if @mail_template.destroy - redirect_to admin_mail_templates_path, notise: t(:deleted) + redirect_to admin_mail_templates_path, notice: t(:deleted) else flash.now[:alert] = I18n.t(:failure) render 'show' diff --git a/app/models/concerns/domain/lockable.rb b/app/models/concerns/domain/lockable.rb index 8292138ed..ae7e215b7 100644 --- a/app/models/concerns/domain/lockable.rb +++ b/app/models/concerns/domain/lockable.rb @@ -15,15 +15,11 @@ module Concerns::Domain::Lockable end def registry_lockable? - (statuses & [ - DomainStatus::PENDING_DELETE_CONFIRMATION, - DomainStatus::PENDING_CREATE, - DomainStatus::PENDING_UPDATE, - DomainStatus::PENDING_DELETE, - DomainStatus::PENDING_RENEW, - DomainStatus::PENDING_TRANSFER, - DomainStatus::FORCE_DELETE, - ]).empty? + (statuses & [DomainStatus::PENDING_DELETE_CONFIRMATION, + DomainStatus::PENDING_CREATE, DomainStatus::PENDING_UPDATE, + DomainStatus::PENDING_DELETE, DomainStatus::PENDING_RENEW, + DomainStatus::PENDING_TRANSFER, DomainStatus::FORCE_DELETE + ]).empty? end def locked_by_registrant? diff --git a/app/presenters/domain_presenter.rb b/app/presenters/domain_presenter.rb index 5ae622353..59568f83c 100644 --- a/app/presenters/domain_presenter.rb +++ b/app/presenters/domain_presenter.rb @@ -72,15 +72,13 @@ class DomainPresenter end end - def remove_registry_lock_btn - if domain.locked_by_registrant? - view.link_to(view.t('admin.domains.registry_lock_delete.btn'), - view.admin_domain_registry_lock_path(domain), - method: :delete, - data: { confirm: view.t('admin.domains.registry_lock_delete.confirm') }, - class: 'dropdown-item') - end + return unless domain.locked_by_registrant? + view.link_to(view.t('admin.domains.registry_lock_delete.btn'), + view.admin_domain_registry_lock_path(domain), + method: :delete, + data: { confirm: view.t('admin.domains.registry_lock_delete.confirm') }, + class: 'dropdown-item') end private