From c03214780d6f905b7a3ad037a30bf3e71a86e65d Mon Sep 17 00:00:00 2001 From: Leonardo Strozzi Date: Wed, 20 Jun 2018 20:25:58 -0300 Subject: [PATCH] Refactor Database Structure templates Signed-off-by: Leonardo Strozzi --- .../Database/DatabaseStructureController.php | 59 ++++++------------- templates/database/search/results.twig | 8 +-- .../database/structure/browse_table.twig | 3 - .../structure/browse_table_label.twig | 3 - templates/database/structure/empty_table.twig | 4 -- .../database/structure/search_table.twig | 3 - .../structure/structure_table_row.twig | 22 +++++-- 7 files changed, 40 insertions(+), 62 deletions(-) delete mode 100644 templates/database/structure/browse_table.twig delete mode 100644 templates/database/structure/browse_table_label.twig delete mode 100644 templates/database/structure/empty_table.twig delete mode 100644 templates/database/structure/search_table.twig diff --git a/libraries/classes/Controllers/Database/DatabaseStructureController.php b/libraries/classes/Controllers/Database/DatabaseStructureController.php index a0196663c3..6c641c55d8 100644 --- a/libraries/classes/Controllers/Database/DatabaseStructureController.php +++ b/libraries/classes/Controllers/Database/DatabaseStructureController.php @@ -546,44 +546,7 @@ class DatabaseStructureController extends DatabaseController $may_have_rows = $current_table['TABLE_ROWS'] > 0 || $table_is_view; $titles = Util::buildActionTitles(); - $browse_table = $this->template->render('database/structure/browse_table', [ - 'tbl_url_query' => $tbl_url_query, - 'title' => $may_have_rows ? $titles['Browse'] : $titles['NoBrowse'], - ]); - - $search_table = $this->template->render('database/structure/search_table', [ - 'tbl_url_query' => $tbl_url_query, - 'title' => $may_have_rows ? $titles['Search'] : $titles['NoSearch'], - ]); - - $browse_table_label = $this->template->render('database/structure/browse_table_label', [ - 'tbl_url_query' => $tbl_url_query, - 'title' => htmlspecialchars($current_table['TABLE_COMMENT']), - 'truename' => $truename, - ]); - - $empty_table = ''; if (!$this->_db_is_system_schema) { - $empty_table = ' '; - if (!$table_is_view) { - $empty_table = $this->template->render('database/structure/empty_table', [ - 'tbl_url_query' => $tbl_url_query, - 'sql_query' => urlencode( - 'TRUNCATE ' . Util::backquote( - $current_table['TABLE_NAME'] - ) - ), - 'message_to_show' => urlencode( - sprintf( - __('Table %s has been emptied.'), - htmlspecialchars( - $current_table['TABLE_NAME'] - ) - ) - ), - 'title' => $may_have_rows ? $titles['Empty'] : $titles['NoEmpty'], - ]); - } $drop_query = sprintf( 'DROP %s %s', ($table_is_view || $current_table['ENGINE'] == null) ? 'VIEW' @@ -647,15 +610,29 @@ class DatabaseStructureController extends DatabaseController 'input_class' => implode(' ', $input_class), 'table_is_view' => $table_is_view, 'current_table' => $current_table, - 'browse_table_label' => $browse_table_label, + 'browse_table_title' => $may_have_rows ? $titles['Browse'] : $titles['NoBrowse'], + 'search_table_title' => $may_have_rows ? $titles['Search'] : $titles['NoSearch'], + 'browse_table_label_title' => htmlspecialchars($current_table['TABLE_COMMENT']), + 'browse_table_label_truename' => $truename, + 'empty_table_sql_query' => urlencode( + 'TRUNCATE ' . Util::backquote( + $current_table['TABLE_NAME'] + ) + ), + 'empty_table_message_to_show' => urlencode( + sprintf( + __('Table %s has been emptied.'), + htmlspecialchars( + $current_table['TABLE_NAME'] + ) + ) + ), + 'empty_table_title' => $may_have_rows ? $titles['Empty'] : $titles['NoEmpty'], 'tracking_icon' => $this->getTrackingIcon($truename), 'server_slave_status' => $GLOBALS['replication_info']['slave']['status'], - 'browse_table' => $browse_table, 'tbl_url_query' => $tbl_url_query, - 'search_table' => $search_table, 'db_is_system_schema' => $this->_db_is_system_schema, 'titles' => $titles, - 'empty_table' => $empty_table, 'drop_query' => $drop_query, 'drop_message' => $drop_message, 'collation' => $collation, diff --git a/templates/database/search/results.twig b/templates/database/search/results.twig index 07bdaebc53..efe5529615 100644 --- a/templates/database/search/results.twig +++ b/templates/database/search/results.twig @@ -1,9 +1,9 @@ {% for row in rows %} @@ -15,7 +15,7 @@ %1$s matches in %2$s {% endtrans %} {% endset %} - {{ result_message | format(row.result_count, row.table) | raw }} + {{ result_message|format(row.result_count, row.table)|raw }} {% if row.result_count > 0 %} {% set url_params = { @@ -51,7 +51,7 @@ {% endfor %}
- {{ 'Search results for "%s" %s:' | format( + {{ 'Search results for "%s" %s:'|format( criteria_search_string, search_type_description - ) | raw }} + )|raw }}
-{% if criteria_tables | length > 1 %} +{% if criteria_tables|length > 1 %}

{% trans %} Total: {{ count }} match diff --git a/templates/database/structure/browse_table.twig b/templates/database/structure/browse_table.twig deleted file mode 100644 index 826a599ef7..0000000000 --- a/templates/database/structure/browse_table.twig +++ /dev/null @@ -1,3 +0,0 @@ - - {{ title|raw }} - diff --git a/templates/database/structure/browse_table_label.twig b/templates/database/structure/browse_table_label.twig deleted file mode 100644 index 5cb861797b..0000000000 --- a/templates/database/structure/browse_table_label.twig +++ /dev/null @@ -1,3 +0,0 @@ - - {{ truename }} - diff --git a/templates/database/structure/empty_table.twig b/templates/database/structure/empty_table.twig deleted file mode 100644 index 753556b07b..0000000000 --- a/templates/database/structure/empty_table.twig +++ /dev/null @@ -1,4 +0,0 @@ - - {{ title|raw }} - diff --git a/templates/database/structure/search_table.twig b/templates/database/structure/search_table.twig deleted file mode 100644 index 0bc2892ae0..0000000000 --- a/templates/database/structure/search_table.twig +++ /dev/null @@ -1,3 +0,0 @@ - - {{ title|raw }} - diff --git a/templates/database/structure/structure_table_row.twig b/templates/database/structure/structure_table_row.twig index 0d01d61114..5bcc62d8c4 100644 --- a/templates/database/structure/structure_table_row.twig +++ b/templates/database/structure/structure_table_row.twig @@ -7,7 +7,9 @@ id="checkbox_tbl_{{ curr }}" /> - {{ browse_table_label|raw }} + + {{ browse_table_label_truename }} + {{ tracking_icon|raw }} {% if server_slave_status %} @@ -38,7 +40,10 @@ {% endif %} - {{ browse_table|raw }} + + {{ browse_table_title|raw }} + + @@ -46,14 +51,23 @@ - {{ search_table|raw }} + + {{ search_table_title|raw }} + {% if not db_is_system_schema %} {{ titles['Insert']|raw }} - {{ empty_table|raw }} + + {% if not table_is_view %} + + {{ empty_table_title|raw }} + + {% endif %} +