diff options
| author | Leonardo Strozzi <laps15@inf.ufpr.br> | 2018-05-22 13:49:14 +0300 |
|---|---|---|
| committer | Leonardo Strozzi <laps15@inf.ufpr.br> | 2018-05-22 13:54:03 +0300 |
| commit | 927fed774ca50ae047a49e265ef280eeb3abfd57 (patch) | |
| tree | 506113eff7fc3e341ec38462d64b2fff1103536c /templates | |
| parent | 83f433695b19b73202c0ae8f9c03937be5f5e409 (diff) | |
Remove md5 twig extension
Adapt templates to remove md5 from PhpFuncionsExtension.php
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/database/structure/structure_table_row.twig | 26 | ||||
| -rw-r--r-- | templates/table/relation/common_form.twig | 2 | ||||
| -rw-r--r-- | templates/table/search/zoom_result_form.twig | 2 |
3 files changed, 4 insertions, 26 deletions
diff --git a/templates/database/structure/structure_table_row.twig b/templates/database/structure/structure_table_row.twig index c1177c9ef9..13b0aee0dd 100644 --- a/templates/database/structure/structure_table_row.twig +++ b/templates/database/structure/structure_table_row.twig @@ -28,8 +28,8 @@ ((already_favorite ? 'remove' : 'add') ~ '_favorite'): true } %} {% include 'database/structure/favorite_anchor.twig' with { - 'table_name_hash': md5(current_table['TABLE_NAME']), - 'db_table_name_hash': md5(db ~ '.' ~ current_table['TABLE_NAME']), + 'table_name_hash': table_name_hash, + 'db_table_name_hash': db_table_name_hash, 'fav_params': fav_params, 'already_favorite': already_favorite, 'titles': titles @@ -184,28 +184,6 @@ {% endif %} {% else %} - {% set count = 0 %} - {% if properties_num_columns %} - {% set count = count + 2 %} - {% endif %} - {% if is_show_stats %} - {% set count = count + 2 %} - {% endif %} - {% if show_charset %} - {% set count = count + 1 %} - {% endif %} - {% if show_comment %} - {% set count = count + 1 %} - {% endif %} - {% if show_creation %} - {% set count = count + 1 %} - {% endif %} - {% if show_last_update %} - {% set count = count + 1 %} - {% endif %} - {% if show_last_check %} - {% set count = count + 1 %} - {% endif %} {% if db_is_system_schema %} {% set action_colspan = 3 %} diff --git a/templates/table/relation/common_form.twig b/templates/table/relation/common_form.twig index 8dd30698b8..8b8393bada 100644 --- a/templates/table/relation/common_form.twig +++ b/templates/table/relation/common_form.twig @@ -117,7 +117,7 @@ {% set myfield = save_row[i]['Field'] %} {# Use an md5 as array index to avoid having special characters in the name attribute (see bug #1746964 ) #} - {% set myfield_md5 = md5(myfield) %} + {% set myfield_md5 = column_array[myfield ~ '_hash'] %} {% set foreign_table = false %} {% set foreign_column = false %} diff --git a/templates/table/search/zoom_result_form.twig b/templates/table/search/zoom_result_form.twig index d76ae19a46..f473e470e0 100644 --- a/templates/table/search/zoom_result_form.twig +++ b/templates/table/search/zoom_result_form.twig @@ -65,7 +65,7 @@ 'in_zoom_search_edit': true, 'foreigners': foreigners, 'column_name': field_popup, - 'column_name_hash': md5(field_popup), + 'column_name_hash': column_name_hashes[field_popup], 'foreign_data': foreign_data, 'table': table, 'column_index': column_index, |