adjust search

This commit is contained in:
Pete Matsyburka
2026-06-25 09:27:59 +03:00
parent 1eaf4e5bab
commit dc1c386d7e
7 changed files with 70 additions and 26 deletions
@@ -32,7 +32,9 @@ class TemplateFoldersController < ApplicationController
@pagy, @templates = pagy_auto(@templates, limit:)
load_related_submissions if params[:q].present? && @templates.blank?
if params[:q].present? && @templates.blank?
@related_submissions_pagy, @related_submissions = load_related_submissions(@template_folder)
end
else
@pagy, @template_folders = pagy(@template_folders, limit: FOLDERS_PER_PAGE)
@@ -66,20 +68,20 @@ class TemplateFoldersController < ApplicationController
params.require(:template_folder).permit(:name)
end
def load_related_submissions
@related_submissions =
def load_related_submissions(template_folder)
related_submissions =
Submission.accessible_by(current_ability)
.where(archived_at: nil)
.where(template_id: current_account.templates.active
.where(folder: [@template_folder, *@template_folder.subfolders])
.where(folder: [template_folder, *template_folder.subfolders])
.select(:id))
.preload(:template_accesses, :created_by_user,
template: :author,
submitters: :start_form_submission_events)
@related_submissions = Submissions.search(current_user, @related_submissions, params[:q])
.order(id: :desc)
related_submissions = Submissions.search(current_user, related_submissions, params[:q])
.order(id: :desc)
@related_submissions_pagy, @related_submissions = pagy_auto(@related_submissions, limit: 5)
pagy_auto(related_submissions, limit: 5)
end
end