Skip to content

Commit 8cb2437

Browse files
authored
fix(admin/contentType): display json menu link with query (#1394)
1 parent 2b63d27 commit 8cb2437

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

templates/macros/data-field-type.html.twig

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -960,16 +960,20 @@
960960
</dt>
961961
<dd>
962962
<ul>
963-
{% set contentType = dataField.fieldType.displayOptions.json_menu_content_type|default('')|emsco_get_content_type %}
963+
{% set contentType = dataField.fieldType.displayOptions.json_menu_content_type|default('')|emsco_get_content_type %}
964964
{% set choices = {} %}
965965
{% set labels = {} %}
966-
{% if contentType %}
967-
{% set hits = emsco_search(
968-
contentType.environment.alias,
969-
dataField.fieldType.displayOptions.query|default('{}'),
970-
contentType.name,
971-
20,
972-
).response.data.hits.hits %}
966+
{% set jmQuery = dataField.fieldType.displayOptions.query is defined ? dataField.fieldType.displayOptions.query|ems_json_decode : false %}
967+
{% if contentType and jmQuery %}
968+
{%- set hits = emsco_search(
969+
contentType.environment.alias,
970+
jmQuery.query|default({}),
971+
contentType.name,
972+
jmQuery.size|default(5000),
973+
jmQuery.from|default(0),
974+
jmQuery.sort|default(null),
975+
jmQuery._source|default(null)
976+
).response.data.hits.hits -%}
973977
{% for hit in hits %}
974978
{% set label = attribute(hit._source, contentType.labelField|default(false))|default(hit._id) ~ ' /' %}
975979
{% set choices = choices|merge([hit._id]) %}

0 commit comments

Comments
 (0)