Skip to content

Commit

Permalink
Extract HTML from CentralColumns::getHtmlForEditTableRow
Browse files Browse the repository at this point in the history 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
  • Loading branch information
@MauricioFauth
MauricioFauth committed Sep 14, 2020
1 parent ec10464 commit 12e7ce1
Show file tree
Hide file tree
Showing 2 changed files with 102 additions and 106 deletions.
118 changes: 12 additions & 106 deletions libraries/classes/CentralColumns.php
View file
Expand Up @@ -764,125 +764,31 @@ private function getEditTableHeader(array $headers): string
*/
private function getHtmlForEditTableRow(array $row, int $row_num): string
{
$tableHtml = '<tr>'
. '<input name="orig_col_name[' . $row_num . ']" type="hidden" '
. 'value="' . htmlspecialchars($row['col_name']) . '">'
. '<td name="col_name" class="nowrap">'
. $this->template->render('columns_definitions/column_name', [
'column_number' => $row_num,
'ci' => 0,
'ci_offset' => 0,
'column_meta' => [
'Field' => $row['col_name'],
],
'cfg_relation' => ['centralcolumnswork' => false],
'max_rows' => $this->maxRows,
])
. '</td>';
$tableHtml .=
'<td name = "col_type" class="nowrap">'
. $this->template->render('columns_definitions/column_type', [
'column_number' => $row_num,
'ci' => 1,
'ci_offset' => 0,
'type_upper' => mb_strtoupper($row['col_type']),
'column_meta' => [],
])
. '</td>';
$tableHtml .=
'<td class="nowrap" name="col_length">'
. $this->template->render('columns_definitions/column_length', [
'column_number' => $row_num,
'ci' => 2,
'ci_offset' => 0,
'length_values_input_size' => 8,
'length_to_display' => $row['col_length'],
])
. '</td>';
$meta = [];
if (! isset($row['col_default']) || $row['col_default'] == '') {
$meta['DefaultType'] = 'NONE';
} elseif ($row['col_default'] === 'CURRENT_TIMESTAMP'
|| $row['col_default'] === 'current_timestamp()'
) {
} elseif ($row['col_default'] === 'CURRENT_TIMESTAMP' || $row['col_default'] === 'current_timestamp()') {
$meta['DefaultType'] = 'CURRENT_TIMESTAMP';
} elseif ($row['col_default'] === 'NULL') {
$meta['DefaultType'] = $row['col_default'];
} else {
$meta['DefaultType'] = 'USER_DEFINED';
$meta['DefaultValue'] = $row['col_default'];
}
$tableHtml .=
'<td class="nowrap" name="col_default">'
. $this->template->render('columns_definitions/column_default', [
'column_number' => $row_num,
'ci' => 3,
'ci_offset' => 0,
'type_upper' => mb_strtoupper((string) $row['col_default']),
'column_meta' => $meta,
'char_editing' => $this->charEditing,
])
. '</td>';
$tableHtml .= '<td name="collation" class="nowrap">';
$tableHtml .= '<select lang="en" dir="ltr" name="field_collation[' . $row_num . ']"';
$tableHtml .= ' id="field_' . $row_num . '_4">' . "\n";
$tableHtml .= '<option value=""></option>' . "\n";

$charsets = Charsets::getCharsets($this->dbi, $this->disableIs);
$collations = Charsets::getCollations($this->dbi, $this->disableIs);
/** @var Charset $charset */
foreach ($charsets as $charset) {
$tableHtml .= '<optgroup label="' . $charset->getName()
. '" title="' . $charset->getDescription() . '">' . "\n";
/** @var Collation $collation */
foreach ($collations[$charset->getName()] as $collation) {
$tableHtml .= '<option value="' . $collation->getName()
. '" title="' . $collation->getDescription() . '"'
. ($row['col_collation'] == $collation->getName() ? ' selected' : '') . '>'
. $collation->getName() . '</option>' . "\n";
}
$tableHtml .= '</optgroup>' . "\n";
}
$tableHtml .= '</select>' . "\n";
$tableHtml .= '</td>';
$tableHtml .=
'<td class="nowrap" name="col_attribute">'
. $this->template->render('columns_definitions/column_attribute', [
'column_number' => $row_num,
'ci' => 5,
'ci_offset' => 0,
'extracted_columnspec' => [
'attribute' => $row['col_attribute'],
],
'column_meta' => [],
'submit_attribute' => false,
'attribute_types' => $this->dbi->types->getAttributes(),
])
. '</td>';
$tableHtml .=
'<td class="nowrap" name="col_isNull">'
. $this->template->render('columns_definitions/column_null', [
'column_number' => $row_num,
'ci' => 6,
'ci_offset' => 0,
'column_meta' => [
'Null' => $row['col_isNull'],
],
])
. '</td>';

$tableHtml .=
'<td class="nowrap" name="col_extra">'
. $this->template->render('columns_definitions/column_extra', [
'column_number' => $row_num,
'ci' => 7,
'ci_offset' => 0,
'column_meta' => ['Extra' => $row['col_extra']],
])
. '</td>';
$tableHtml .= '</tr>';

return $tableHtml;

return $this->template->render('database/central_columns/edit_table_row', [
'row_num' => $row_num,
'row' => $row,
'max_rows' => $this->maxRows,
'meta' => $meta,
'char_editing' => $this->charEditing,
'charsets' => $charsets,
'collations' => $collations,
'attribute_types' => $this->dbi->types->getAttributes(),
]);
}

/**
Expand Down
90 changes: 90 additions & 0 deletions templates/database/central_columns/edit_table_row.twig
View file
@@ -0,0 +1,90 @@
<tr>
<input name="orig_col_name[{{ row_num }}]" type="hidden" value="{{ row['col_name'] }}">
<td name="col_name" class="nowrap">
{% include 'columns_definitions/column_name.twig' with {
'column_number': row_num,
'ci': 0,
'ci_offset': 0,
'column_meta': {'Field': row['col_name']},
'cfg_relation': {'centralcolumnswork': false},
'max_rows': max_rows
} only %}
</td>

<td name="col_type" class="nowrap">
{% include 'columns_definitions/column_type.twig' with {
'column_number': row_num,
'ci': 1,
'ci_offset': 0,
'column_meta': [],
'type_upper': row['col_type']|upper
} only %}
</td>

<td class="nowrap" name="col_length">
{% include 'columns_definitions/column_length.twig' with {
'column_number': row_num,
'ci': 2,
'ci_offset': 0,
'length_values_input_size': 8,
'length_to_display': row['col_length']
} only %}
</td>

<td class="nowrap" name="col_default">
{% include 'columns_definitions/column_default.twig' with {
'column_number': row_num,
'ci': 3,
'ci_offset': 0,
'column_meta': meta,
'type_upper': row['col_default']|upper,
'default_value': '',
'char_editing': char_editing
} only %}
</td>

<td name="collation" class="nowrap">
<select lang="en" dir="ltr" name="field_collation[{{ row_num }}]" id="field_{{ row_num }}_4">
<option value=""></option>
{% for charset in charsets %}
<optgroup label="{{ charset.getName() }}" title="{{ charset.getDescription() }}">
{% for collation in collations[charset.getName()] %}
<option value="{{ collation.getName() }}" title="{{ collation.getDescription() }}"{{ row['col_collation'] == collation.getName() ? ' selected' }}>
{{ collation.getName() }}
</option>
{% endfor %}
</optgroup>
{% endfor %}
</select>
</td>

<td class="nowrap" name="col_attribute">
{% include 'columns_definitions/column_attribute.twig' with {
'column_number': row_num,
'ci': 5,
'ci_offset': 0,
'column_meta': [],
'extracted_columnspec': {'attribute': row['col_attribute']},
'submit_attribute': false,
'attribute_types': attribute_types
} only %}
</td>

<td class="nowrap" name="col_isNull">
{% include 'columns_definitions/column_null.twig' with {
'column_number': row_num,
'ci': 6,
'ci_offset': 0,
'column_meta': {'Null': row['col_isNull']}
} only %}
</td>

<td class="nowrap" name="col_extra">
{% include 'columns_definitions/column_extra.twig' with {
'column_number': row_num,
'ci': 7,
'ci_offset': 0,
'column_meta': {'Extra': row['col_extra']}
} only %}
</td>
</tr>

0 comments on commit 12e7ce1

Please sign in to comment.