From 35a2aba887be86f895f2eb4492c80d62f45aea43 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Fri, 13 Dec 2024 13:31:54 +0200 Subject: [PATCH] adjust permanently remove --- app/controllers/api/submissions_controller.rb | 2 +- app/controllers/api/templates_controller.rb | 2 +- app/controllers/submissions_controller.rb | 2 +- app/controllers/templates_controller.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/submissions_controller.rb b/app/controllers/api/submissions_controller.rb index e0de0b4c..08b2ed02 100644 --- a/app/controllers/api/submissions_controller.rb +++ b/app/controllers/api/submissions_controller.rb @@ -93,7 +93,7 @@ module Api end def destroy - if params[:permanently] == 'true' + if params[:permanently].in?(['true', true]) @submission.destroy! else @submission.update!(archived_at: Time.current) diff --git a/app/controllers/api/templates_controller.rb b/app/controllers/api/templates_controller.rb index e922102a..94d2c8f3 100644 --- a/app/controllers/api/templates_controller.rb +++ b/app/controllers/api/templates_controller.rb @@ -74,7 +74,7 @@ module Api end def destroy - if params[:permanently] == 'true' + if params[:permanently].in?(['true', true]) @template.destroy! else @template.update!(archived_at: Time.current) diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb index d2c20653..1dac63bd 100644 --- a/app/controllers/submissions_controller.rb +++ b/app/controllers/submissions_controller.rb @@ -61,7 +61,7 @@ class SubmissionsController < ApplicationController def destroy notice = - if params[:permanently].present? + if params[:permanently].in?(['true', true]) @submission.destroy! I18n.t('submission_has_been_removed') diff --git a/app/controllers/templates_controller.rb b/app/controllers/templates_controller.rb index 1b52c23b..b11812ab 100644 --- a/app/controllers/templates_controller.rb +++ b/app/controllers/templates_controller.rb @@ -93,7 +93,7 @@ class TemplatesController < ApplicationController def destroy notice = - if params[:permanently].present? + if params[:permanently].in?(['true', true]) @template.destroy! I18n.t('template_has_been_removed')