From 4f8f08ecc9c2354a45747837fade46b5957521dd Mon Sep 17 00:00:00 2001 From: Matt Farnsworth Date: Wed, 2 Dec 2015 13:49:44 +0200 Subject: [PATCH] Story #109086524 - force is_admin to skip validation until validations can be fixed --- app/controllers/admin/pending_updates_controller.rb | 2 ++ app/models/epp/domain.rb | 1 + 2 files changed, 3 insertions(+) diff --git a/app/controllers/admin/pending_updates_controller.rb b/app/controllers/admin/pending_updates_controller.rb index 4d08297d7..3a15fb3a5 100644 --- a/app/controllers/admin/pending_updates_controller.rb +++ b/app/controllers/admin/pending_updates_controller.rb @@ -6,6 +6,8 @@ class Admin::PendingUpdatesController < AdminController authorize! :update, :pending @epp_domain = Epp::Domain.find(params[:domain_id]) # only epp domain has apply pending + @epp_domain.is_admin = true + if @epp_domain.apply_pending_update! redirect_to admin_domain_path(@domain.id), notice: t(:pending_applied) else diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index 613c57115..4d86e7e15 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -4,6 +4,7 @@ class Epp::Domain < Domain before_validation :manage_permissions def manage_permissions + return if is_admin # this bad hack for 109086524, refactor later return unless update_prohibited? || delete_prohibited? add_epp_error('2304', nil, nil, I18n.t(:object_status_prohibits_operation)) false