From c20aa08b45eecb08544ffed532f99c68ebf315e5 Mon Sep 17 00:00:00 2001 From: LorenzoJokhan Date: Tue, 14 Feb 2023 12:01:21 +0100 Subject: [PATCH] specify if theme labels should be shown --- .../resource-form-widgets/lib/fields.js | 18 +++++++++++++++++- .../views/includes/fields/tags.html | 4 +++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/packages/cms/lib/modules/resource-form-widgets/lib/fields.js b/packages/cms/lib/modules/resource-form-widgets/lib/fields.js index 7296c6cf9..30f17d9cd 100644 --- a/packages/cms/lib/modules/resource-form-widgets/lib/fields.js +++ b/packages/cms/lib/modules/resource-form-widgets/lib/fields.js @@ -148,7 +148,7 @@ const fields = [ { value: 'tags', label: "Tags (currently only works for ideas)", - showFields: ['fieldKey', 'fieldRequired', 'theme', 'fieldMin', 'fieldMax'] + showFields: ['fieldKey', 'fieldRequired', 'theme', 'showThemeNames', 'fieldMin', 'fieldMax'] }, { value: 'raw', @@ -301,6 +301,22 @@ const fields = [ label: 'Themes, Optionally specify the single theme (one word) by which to fetch the tags.', type: 'string' }, + { + name: 'showThemeNames', + label: 'When the above option is empty, select if the corresponding themes should be shown or not', + type: 'boolean', + choices: [ + { + label: 'Yes', + value: true, + }, + { + label: 'No', + value: false, + } + ], + def: true + }, { name: 'notExtraDataKey', label: 'Save field in root if data object and not in extraData, will only work if column exists in database)', diff --git a/packages/cms/lib/modules/resource-form-widgets/views/includes/fields/tags.html b/packages/cms/lib/modules/resource-form-widgets/views/includes/fields/tags.html index 42502afca..ca990741c 100644 --- a/packages/cms/lib/modules/resource-form-widgets/views/includes/fields/tags.html +++ b/packages/cms/lib/modules/resource-form-widgets/views/includes/fields/tags.html @@ -24,13 +24,15 @@ {% for key, tagList in data.groupedOpenstadTags %} {% set outer_loop = loop %} + {% if field.showThemeNames %} {% if outer_loop.length > 1 and key !== 'undefined' %} -

{{key}}

+

{{key}}

{% endif %} {% if outer_loop.length > 1 and key == 'undefined' %}

Overig

{% endif %} + {% endif %} {% for tag in tagList %}