Merge pull request #986 from internetee/registry-887-revoke-certifica…

…te-before-removing-it Revoke, and then delete a certificate
internetee · Sep 21, 2018 · e53c7e3 · e53c7e3
2 parents 07aa736 + 24b87d8
commit e53c7e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/app/controllers/admin/certificates_controller.rb b/app/controllers/admin/certificates_controller.rb
@@ -28,6 +28,10 @@ def create
     end
 
     def destroy
+      if @certificate.interface == Certificate::REGISTRAR
+        @certificate.revoke!
+      end
+
       if @certificate.destroy
         flash[:notice] = I18n.t('record_deleted')
         redirect_to admin_api_user_path(@api_user)

diff --git a/app/models/certificate.rb b/app/models/certificate.rb
@@ -127,6 +127,7 @@ def revoke!
 
     self.class.update_registry_crl
     self.class.reload_apache
+    self
   end
 
   class << self
-Original file line number
+Diff line change
@@ Expand Up / @@ -127,6 +127,7 @@ def revoke! @@
         self.class.update_registry_crl
         self.class.reload_apache
+        self
       end
       class << self
@@ Expand Down @@