From 30c913b54fe8fb353f3a889593c76fbc3a8e5778 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Wed, 29 Nov 2023 20:23:35 +0200 Subject: [PATCH] add template api folder filters --- app/controllers/api/submissions_controller.rb | 4 ++++ app/controllers/api/templates_controller.rb | 1 + 2 files changed, 5 insertions(+) diff --git a/app/controllers/api/submissions_controller.rb b/app/controllers/api/submissions_controller.rb index 0424e635..96cad324 100644 --- a/app/controllers/api/submissions_controller.rb +++ b/app/controllers/api/submissions_controller.rb @@ -13,6 +13,10 @@ module Api submissions = Submissions.search(@submissions, params[:q]) submissions = submissions.where(template_id: params[:template_id]) if params[:template_id].present? + if params[:template_folder].present? + submissions = submissions.joins(template: :folder).where(folder: { name: params[:template_folder] }) + end + submissions = paginate(submissions.preload(:created_by_user, :template, :submitters, audit_trail_attachment: :blob)) diff --git a/app/controllers/api/templates_controller.rb b/app/controllers/api/templates_controller.rb index 43d5f99c..d1a851f6 100644 --- a/app/controllers/api/templates_controller.rb +++ b/app/controllers/api/templates_controller.rb @@ -9,6 +9,7 @@ module Api templates = params[:archived] ? templates.archived : templates.active templates = templates.where(application_key: params[:application_key]) if params[:application_key].present? + templates = templates.joins(:folder).where(folder: { name: params[:folder] }) if params[:folder].present? templates = paginate(templates.preload(:author, documents_attachments: :blob))