From 59522cab5a93f44acfff22cc57be7c163cc0e533 Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Wed, 11 Nov 2015 17:07:34 +0200
Subject: [PATCH] Story #104525314 - feature conflict, set admin flag from
 admin controller'

---
 app/controllers/admin/pending_deletes_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/admin/pending_deletes_controller.rb b/app/controllers/admin/pending_deletes_controller.rb
index d885b3a99..4866d65c9 100644
--- a/app/controllers/admin/pending_deletes_controller.rb
+++ b/app/controllers/admin/pending_deletes_controller.rb
@@ -6,6 +6,7 @@ class Admin::PendingDeletesController < 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_delete!
       redirect_to admin_domain_path(@domain.id), notice: t(:pending_applied)
     else
@@ -16,6 +17,7 @@ class Admin::PendingDeletesController < AdminController
   def destroy
     authorize! :destroy, :pending
 
+    @epp_domain.is_admin= true
     if @domain.clean_pendings!
       redirect_to admin_domain_path(@domain.id), notice: t(:pending_removed)
     else