Skip to content

Commit

Permalink
Fix for < being stripped from pre-filter values in menu settings
Browse files Browse the repository at this point in the history
  • Loading branch information
cheesegrits committed Jul 15, 2019
1 parent 84240ff commit 9fb1899
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 4 deletions.
Expand Up @@ -64,6 +64,7 @@

<field name="prefilters"
type="fabrikmodalrepeat"
filter="raw"
label="COM_FABRIK_LIST_PREFILTERS_LABEL"
description="COM_FABRIK_LIST_PREFILTERS_DESC">

Expand Down
Expand Up @@ -24,7 +24,7 @@
</fields>
</field>

<field description="MOD_FABRIK_LIST_PREFILTERS_DESC" label="MOD_FABRIK_LIST_PREFILTERS_LABEL" name="prefilters" type="fabrikmodalrepeat">
<field description="MOD_FABRIK_LIST_PREFILTERS_DESC" label="MOD_FABRIK_LIST_PREFILTERS_LABEL" name="prefilters" type="fabrikmodalrepeat" filter="raw">

<fields name="params">
<fieldset modal="true" name="prefilters_modal" repeat="true">
Expand Down Expand Up @@ -56,7 +56,7 @@
<option value="birthday">COM_FABRIK_BIRTHDAY_TODAY</option>
</field>

<field label="MOD_FABRIK_LIST_FILTER_VALUE_HEADING" name="filter-value" type="field"/>
<field label="MOD_FABRIK_LIST_FILTER_VALUE_HEADING" name="filter-value" type="field" filter="raw"/>

<field label="MOD_FABRIK_LIST_FILTER_ACCESS_HEADING" name="filter-access" type="accesslevel"/>

Expand Down
Expand Up @@ -32,6 +32,7 @@
hide="readmore,pagebreak"
description="COM_FABRIK_FIELD_INTRODUCTION_DESC"
label="COM_FABRIK_FIELD_INTRODUCTION_LABEL"
filter="FabrikAdminHelper::filterText"
rows="3"/>

<field name="plugin"
Expand Down
4 changes: 2 additions & 2 deletions administrator/modules/mod_fabrik_list/mod_fabrik_list.xml
Expand Up @@ -74,7 +74,7 @@
</fields>
</field>

<field name="prefilters" type="fabrikmodalrepeat" description="MOD_FABRIK_LIST_PREFILTERS_DESC" label="MOD_FABRIK_LIST_PREFILTERS_LABEL">
<field name="prefilters" type="fabrikmodalrepeat" filter="raw" description="MOD_FABRIK_LIST_PREFILTERS_DESC" label="MOD_FABRIK_LIST_PREFILTERS_LABEL">

<fields name="params">
<fieldset modal="true" name="prefilters_modal" repeat="true">
Expand Down Expand Up @@ -107,7 +107,7 @@
<option value="nextweek1">COM_FABRIK_NEXT_WEEK1</option>
</field>

<field name="filter-value" type="textarea" label="MOD_FABRIK_LIST_FILTER_VALUE_HEADING"/>
<field name="filter-value" type="textarea" filter="raw" label="MOD_FABRIK_LIST_FILTER_VALUE_HEADING"/>

<field name="filter-eval" type="list" label="MOD_FABRIK_LIST_TYPE">
<option value="0">MOD_FABRIK_LIST_TEXT</option>
Expand Down
1 change: 1 addition & 0 deletions components/com_fabrik/views/list/tmpl/default.xml
Expand Up @@ -96,6 +96,7 @@
</field>

<field name="prefilters"
filter="raw"
type="fabrikmodalrepeat"
class="prefilters-modal"
label="COM_FABRIK_LIST_PREFILTERS_LABEL"
Expand Down

0 comments on commit 9fb1899

Please sign in to comment.