Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Desportes <williamdes@wdes.fr>2019-11-20 14:28:12 +0300
committerWilliam Desportes <williamdes@wdes.fr>2019-11-20 14:29:07 +0300
commit770f30aa8628f761122fa9d09b387862c830317e (patch)
tree3530c0ac682a7f921cb4aa992d81f96e50624404 /templates
parent5aa55122b75f76518111210b319fe534144b0bd2 (diff)
Fix display field in Designer
Introduced by: a23f2ba51a93af0c5eedf91646aa9e04b9bc3a12 Signed-off-by: William Desportes <williamdes@wdes.fr>
Diffstat (limited to 'templates')
-rw-r--r--templates/database/designer/database_tables.twig6
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/database/designer/database_tables.twig b/templates/database/designer/database_tables.twig
index e036488833..9d612ccd18 100644
--- a/templates/database/designer/database_tables.twig
+++ b/templates/database/designer/database_tables.twig
@@ -61,11 +61,11 @@
</thead>
<tbody id="id_tbody_{{ t_n_url }}"
{{- tab_pos[t_n] is defined and tab_pos[t_n]['V'] is empty ? ' style="display: none"' }}>
- {% set display_field = Relation_getDisplayField(get_db, t_n) %}
+ {% set display_field = designerTable.getDisplayField() %}
{% for j in 0..tab_column[t_n]['COLUMN_ID']|length - 1 %}
{% set tmp_column = t_n ~ '.' ~ tab_column[t_n]['COLUMN_NAME'][j] %}
{% set click_field_param = [
- db_url,
+ designerTable.getTableName()|escape('url'),
tab_column[t_n]['COLUMN_NAME'][j]|url_encode
] %}
{% if not designerTable.supportsForeignkeys() %}
@@ -76,7 +76,7 @@
{% set click_field_param = click_field_param|merge([tables_all_keys[tmp_column] is defined ? 1 : 0]) %}
{% endif %}
{% set click_field_param = click_field_param|merge([db]) %}
- <tr id="id_tr_{{ t_n }}.{{ tab_column[t_n]['COLUMN_NAME'][j] }}" class="tab_field
+ <tr id="id_tr_{{ designerTable.getTableName()|escape('url') }}.{{ tab_column[t_n]['COLUMN_NAME'][j] }}" class="tab_field
{{- display_field == tab_column[t_n]['COLUMN_NAME'][j] ? '_3' }}" click_field_param="
{{- click_field_param|join(',') }}">
{% if has_query %}