diff --git a/app/controllers/api/submissions_controller.rb b/app/controllers/api/submissions_controller.rb index 131e6779..d8f2f338 100644 --- a/app/controllers/api/submissions_controller.rb +++ b/app/controllers/api/submissions_controller.rb @@ -89,11 +89,15 @@ module Api end def destroy - @submission.update!(archived_at: Time.current) + if params[:permanently] == 'true' + @submission.destroy! + else + @submission.update!(archived_at: Time.current) - SendSubmissionArchivedWebhookRequestJob.perform_later(@submission) + SendSubmissionArchivedWebhookRequestJob.perform_later(@submission) + end - render json: @submission.as_json(only: %i[id], methods: %i[archived_at]) + render json: @submission.as_json(only: %i[id archived_at]) end private diff --git a/app/controllers/api/templates_controller.rb b/app/controllers/api/templates_controller.rb index bd7e80e8..09c6b724 100644 --- a/app/controllers/api/templates_controller.rb +++ b/app/controllers/api/templates_controller.rb @@ -71,7 +71,7 @@ module Api end def destroy - if params[:permanently] == 'true' && !Docuseal.multitenant? + if params[:permanently] == 'true' @template.destroy! else @template.update!(archived_at: Time.current)