Port server/databases/table_header template to Twig

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
phpmyadmin · Oct 29, 2017 · 412020b · 412020b
1 parent 0e86725
commit 412020b
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 55 deletions.
diff --git a/libraries/classes/Controllers/Server/ServerDatabasesController.php b/libraries/classes/Controllers/Server/ServerDatabasesController.php
@@ -542,21 +542,19 @@ function _buildHtmlForDb(
     private function _getHtmlForTableHeader(
         array $_url_params, array $column_order, array $first_database
     ) {
-        return Template::get('server/databases/table_header')->render(
-            array(
-                '_url_params' => $_url_params,
-                'sort_by' => $this->_sort_by,
-                'sort_order' => $this->_sort_order,
-                'sort_order_text' => ($this->_sort_order == 'asc'
-                    ? __('Ascending') : __('Descending')),
-                'column_order' => $column_order,
-                'first_database' => $first_database,
-                'master_replication'
-                    => $GLOBALS['replication_info']['master']['status'],
-                'slave_replication'
-                    => $GLOBALS['replication_info']['slave']['status'],
-            )
-        );
+        return Template::get('server/databases/table_header')->render([
+            'url_params' => $_url_params,
+            'sort_by' => $this->_sort_by,
+            'sort_order' => $this->_sort_order,
+            'sort_order_text' => ($this->_sort_order == 'asc'
+                ? __('Ascending') : __('Descending')),
+            'column_order' => $column_order,
+            'first_database' => $first_database,
+            'master_replication' => $GLOBALS['replication_info']['master']['status'],
+            'slave_replication' => $GLOBALS['replication_info']['slave']['status'],
+            'is_superuser' => $GLOBALS['dbi']->isSuperuser(),
+            'allow_user_drop_database' => $GLOBALS['cfg']['AllowUserDropDatabase'],
+        ]);
     }
 
 

diff --git a/templates/server/databases/table_header.phtml b/templates/server/databases/table_header.phtml
diff --git a/templates/server/databases/table_header.twig b/templates/server/databases/table_header.twig
@@ -0,0 +1,39 @@
+<thead>
+    <tr>
+        {% if is_superuser or allow_user_drop_database %}
+            <th></th>
+        {% endif %}
+        <th>
+            <a href="server_databases.php{{ Url_getCommon(url_params) }}">
+                {% trans 'Database' %}
+                {{ sort_by == 'SCHEMA_NAME' ? Util_getImage(
+                    's_' ~ sort_order ~ '.png',
+                    sort_order_text
+                ) }}
+            </a>
+        </th>
+        {% for stat_name, stat in column_order if stat_name in first_database|keys %}
+            {% set url_params = url_params|merge({
+                'sort_by': stat_name,
+                'sort_order': sort_by == stat_name and sort_order == 'desc' ? 'asc' : 'desc'
+            }) %}
+
+            <th{{ stat['format'] is same as('byte') ? ' colspan="2"' }}>
+                <a href="server_databases.php{{ Url_getCommon(url_params) }}">
+                    {{ stat['disp_name'] }}
+                    {{ sort_by == stat_name ? Util_getImage(
+                        's_' ~ sort_order ~ '.png',
+                        sort_order_text
+                    ) }}
+                </a>
+            </th>
+        {% endfor %}
+        {% if master_replication %}
+            <th>{% trans 'Master replication' %}</th>
+        {% endif %}
+        {% if slave_replication %}
+            <th>{% trans 'Slave replication' %}</th>
+        {% endif %}
+        <th>{% trans 'Action' %}</th>
+    </tr>
+</thead>