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

Merge pull request #14384 from williamdes/issues-14225-14374

Browse Source 
Fixes structure and index icon
This commit is contained in:
Maurício Meneghini Fauth 2018-06-15 13:22:19 -03:00 committed by GitHub
commit 8e35118d37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libraries/classes/Controllers/Table/TableStructureController.php
View File

@ -1334,8 +1334,7 @@ class TableStructureController extends TableController
$rownum = 0;
$columns_list = [];
$attributes = [];
$displayed_field_names = [];
$displayed_field_names_replaced = [];
$displayed_fields = [];
$row_comments = [];
$extracted_columnspecs = [];
foreach ($fields as $field) {
@ -1356,30 +1355,25 @@ class TableStructureController extends TableController
$field = array_merge($field, ['Default' => $field['Default']]);
}
$displayed_field_names[$rownum] = $field['Field'];
$displayed_fields[$rownum] = new \stdClass();
$displayed_fields[$rownum]->text = $field['Field'];
$displayed_fields[$rownum]->icon = "";
$row_comments[$rownum] = '';
if (isset($comments_map[$field['Field']])) {
$displayed_field_names[$rownum] = '<span ' .
'class="commented_column" title="' . $comments_map[$field['Field']] .
'">' . htmlspecialchars($field['Field']) . "</span>";
$displayed_fields[$rownum]->comment = $comments_map[$field['Field']];
$row_comments[$rownum] = $comments_map[$field['Field']];
}
if ($primary_index && $primary_index->hasColumn($field['Field'])) {
$displayed_field_names[$rownum] = $displayed_field_names[$rownum] .
$displayed_fields[$rownum]->icon .=
Util::getImage('b_primary', __('Primary'));
}
if (in_array($field['Field'], $columns_with_index)) {
$displayed_field_names[$rownum] = $displayed_field_names[$rownum] .
Util::getImage('b_key', __('Index'));
$displayed_fields[$rownum]->icon .=
Util::getImage('bd_primary', __('Index'));
}
$displayed_field_names_replaced[$rownum] = preg_replace(
'/[\\x00-\\x1F]/',
'&#x2051;',
$displayed_field_names[$rownum]
);
}
return Template::get('table/structure/display_structure')->render(
@ -1417,8 +1411,7 @@ class TableStructureController extends TableController
'partition_names' => Partition::getPartitionNames($this->db, $this->table),
'columns_list' => $columns_list,
'attributes' => $attributes,
'displayed_field_names' => $displayed_field_names,
'displayed_field_names_replaced' => $displayed_field_names_replaced,
'displayed_fields' => $displayed_fields,
'row_comments' => $row_comments,
]
);

3
templates/table/structure/display_structure.twig
View File

@ -25,7 +25,6 @@
{% set extracted_columnspec = extracted_columnspecs[rownum] %}
{% set field_name = row['Field']|e %}
{% set displayed_field_name = displayed_field_names[rownum] %}
{# For column comments #}
{% set comments = row_comments[rownum] %}
{# Underline commented fields and display a hover-title (CSS only) #}
@ -34,7 +33,7 @@
{% include 'table/structure/table_structure_row.twig' with {
'row': row,
'rownum': rownum,
'displayed_field_name': displayed_field_names_replaced[rownum],
'displayed_field': displayed_fields[rownum],
'type_nowrap': Util_getClassForType(extracted_columnspec['type']),
'extracted_columnspec': extracted_columnspec,
'attribute': attributes[rownum],

7
templates/table/structure/table_structure_row.twig
View File

@ -4,7 +4,12 @@
<td class="right">{{ rownum }}</td>
<th class="nowrap">
<label for="checkbox_row_{{ rownum }}">
{{ displayed_field_name|raw }}
{% if displayed_field.comment is defined %}
<span class="commented_column" title="{{ displayed_field.comment }}">{{ displayed_field.text }}</span>
{% else %}
{{ displayed_field.text }}
{% endif %}
{{ displayed_field.icon|raw }}
</label>
</th>
<td {{ type_nowrap }}>