Port table/search/rows_normal template to Twig

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
This commit is contained in:
Maurício Meneghini Fauth 2017-10-03 22:06:49 -03:00
parent f5bedb1911
commit 5a7645a302
3 changed files with 43 additions and 50 deletions

View File

@ -16,10 +16,10 @@
<?= PhpMyAdmin\Template::get('table/search/rows_normal')
->render(array(
'self' => $self,
'geomColumnFlag' => $geomColumnFlag,
'columnNames' => $columnNames,
'columnTypes' => $columnTypes,
'columnCollations' => $columnCollations
'geom_column_flag' => $geomColumnFlag,
'column_names' => $columnNames,
'column_types' => $columnTypes,
'column_collations' => $columnCollations
)) ?>
<?php endif; ?>
</tbody>

View File

@ -1,46 +0,0 @@
<?php
// for every column present in table
for (
$column_index = 0, $nb = count($columnNames);
$column_index < $nb;
$column_index++
): ?>
<tr class="noclick">
<!-- If 'Function' column is present trying to change comment -->
<?php if ($geomColumnFlag): ?>
<?= PhpMyAdmin\Template::get('table/search/geom_func')
->render(array(
'column_index' => $column_index,
'column_types' => $columnTypes,
)); ?>
<?php endif; ?>
<!-- Displays column's name, type, collation and value -->
<th>
<?= htmlspecialchars($columnNames[$column_index]); ?>
</th>
<?php $properties = $self->getColumnProperties($column_index, $column_index); ?>
<td dir="ltr">
<?= htmlspecialchars($properties['type']); ?>
</td>
<td>
<?= $properties['collation']; ?>
</td>
<td>
<?= $properties['func']; ?>
</td>
<!-- here, the data-type attribute is needed for a date/time picker-->
<td data-type="<?= htmlspecialchars($properties['type']); ?>">
<?= $properties['value']; ?>
<!-- Displays hidden fields -->
<input type="hidden"
name="criteriaColumnNames[<?= $column_index; ?>]"
value="<?= htmlspecialchars($columnNames[$column_index]); ?>" />
<input type="hidden"
name="criteriaColumnTypes[<?= $column_index; ?>]"
value="<?= htmlspecialchars($columnTypes[$column_index]); ?>" />
<input type="hidden"
name="criteriaColumnCollations[<?= $column_index; ?>]"
value="<?= $columnCollations[$column_index]; ?>" />
</td>
</tr>
<?php endfor; ?>

View File

@ -0,0 +1,39 @@
{% for column_index in 0..column_names|length - 1 %}
<tr class="noclick">
{# If 'Function' column is present trying to change comment #}
{% if geom_column_flag %}
{% include 'table/search/geom_func.twig' with {
'column_index': column_index,
'column_types': column_types
} only %}
{% endif %}
{# Displays column's name, type, collation and value #}
<th>
{{ column_names[column_index] }}
</th>
{% set properties = self.getColumnProperties(column_index, column_index) %}
<td dir="ltr">
{{ properties['type'] }}
</td>
<td>
{{ properties['collation'] }}
</td>
<td>
{{ properties['func'] }}
</td>
{# here, the data-type attribute is needed for a date/time picker #}
<td data-type="{{ properties['type'] }}">
{{ properties['value'] }}
{# Displays hidden fields #}
<input type="hidden"
name="criteriaColumnNames[{{ column_index }}]"
value="{{ column_names[column_index] }}" />
<input type="hidden"
name="criteriaColumnTypes[{{ column_index }}]"
value="{{ column_types[column_index] }}" />
<input type="hidden"
name="criteriaColumnCollations[{{ column_index }}]"
value="{{ column_collations[column_index] }}" />
</td>
</tr>
{% endfor %}