From ce8ec8e51453075dd21c12ed7c2d14ac8c064efd Mon Sep 17 00:00:00 2001 From: Angus McLeod <angus@mcleod.org.au> Date: Mon, 17 Feb 2025 15:28:01 +0100 Subject: [PATCH] FIX: ensure null fields are displayed in submission admin --- .../controllers/admin-wizards-submissions-show.js | 8 +++----- plugin.rb | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js b/assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js index f3f61e0a..f77e971d 100644 --- a/assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js +++ b/assets/javascripts/discourse/controllers/admin-wizards-submissions-show.js @@ -35,14 +35,12 @@ export default Controller.extend({ @discourseComputed("submissions.[]", "fields.@each.enabled") displaySubmissions(submissions, fields) { let result = []; + let enabledFields = fields.filter((f) => f.enabled); submissions.forEach((submission) => { let sub = {}; - - Object.keys(submission).forEach((fieldId) => { - if (fields.some((f) => f.id === fieldId && f.enabled)) { - sub[fieldId] = submission[fieldId]; - } + enabledFields.forEach((field) => { + sub[field.id] = submission[field.id]; }); result.push(sub); }); diff --git a/plugin.rb b/plugin.rb index fe162889..12a33620 100644 --- a/plugin.rb +++ b/plugin.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # name: discourse-custom-wizard # about: Forms for Discourse. Better onboarding, structured posting, data enrichment, automated actions and much more. -# version: 2.11.1 +# version: 2.11.2 # authors: Angus McLeod, Faizaan Gagan, Robert Barrow, Keegan George, Kaitlin Maddever, Juan Marcos Gutierrez Ramos # url: https://github.com/paviliondev/discourse-custom-wizard # contact_emails: development@pavilion.tech