gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #16384 - Fix #16245 - Failed Zoom search clears existing values

Browse Source 
Pull-request: #16384
Fixes: #16245

Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-10-11 21:24:16 +02:00
commit c87576f44c
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
templates/table/search/rows_zoom.twig
View File

@ -37,10 +37,10 @@
and criteria_column_names[i] != 'pma_null' %}
{% set key = keys[criteria_column_names[i]] %}
{% set properties = self.getColumnProperties(i, key) %}
{% set type = type|merge({i: properties['type']}) %}
{% set collation = collation|merge({i: properties['collation']}) %}
{% set func = func|merge({i: properties['func']}) %}
{% set value = value|merge({i: properties['value']}) %}
{% set type = type|merge({(i): properties['type']}) %}
{% set collation = collation|merge({(i): properties['collation']}) %}
{% set func = func|merge({(i): properties['func']}) %}
{% set value = value|merge({(i): properties['value']}) %}
{% endif %}
{# Column type #}
<td dir="ltr">
@ -56,9 +56,9 @@
</td>
{# Inputbox for search criteria value #}
<td>
{{ value[i] is defined ? value[i]|raw }}
</td>
<td>
{{ value[i] is defined ? value[i]|raw }}
{# Displays hidden fields #}
<input type="hidden"
name="criteriaColumnTypes[{{ i }}]"