Port database/structure/favorite_anchor to Twig

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
phpmyadmin · Oct 12, 2017 · 47af251 · 47af251
1 parent 7f47703
commit 47af251
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 23 deletions.
diff --git a/libraries/classes/Controllers/Database/DatabaseStructureController.php b/libraries/classes/Controllers/Database/DatabaseStructureController.php
@@ -274,6 +274,12 @@ public function addRemoveFavoriteTablesAction()
             );
             return;
         }
+        // Check if current table is already in favorite list.
+        $favParams = array('db' => $this->db,
+            'ajax_request' => true,
+            'favorite_table' => $favorite_table,
+            (($already_favorite ? 'remove' : 'add') . '_favorite') => true
+        );
         $this->response->addJSON(
             array(
                 'user' => $user,
@@ -282,12 +288,11 @@ public function addRemoveFavoriteTablesAction()
                 'anchor' => Template::get('database/structure/favorite_anchor')
                     ->render(
                         array(
-                            'db' => $this->db,
-                            'current_table' => array(
-                                'TABLE_NAME' => $favorite_table
-                            ),
+                            'table_name_hash' => md5($favorite_table),
+                            'db_table_name_hash' => md5($this->db . "." . $favorite_table),
+                            'fav_params' => $favParams,
+                            'already_favorite' => $already_favorite,
                             'titles' => $titles,
-                            'already_favorite' => $already_favorite
                         )
                     )
             )

diff --git a/templates/database/structure/favorite_anchor.phtml b/templates/database/structure/favorite_anchor.phtml
diff --git a/templates/database/structure/favorite_anchor.twig b/templates/database/structure/favorite_anchor.twig
@@ -0,0 +1,7 @@
+<a id="{{ table_name_hash }}_favorite_anchor"
+    class="ajax favorite_table_anchor"
+    href="db_structure.php{{ Url_getCommon(fav_params) }}"
+    title="{{ already_favorite ? 'Remove from Favorites'|trans : 'Add to Favorites'|trans }}"
+    data-favtargets="{{ db_table_name_hash }}" >
+    {{ already_favorite ? titles['Favorite'] : titles['NoFavorite'] }}
+</a>
diff --git a/templates/database/structure/structure_table_row.phtml b/templates/database/structure/structure_table_row.phtml
@@ -22,12 +22,21 @@
     ?>
     <?php if ($GLOBALS['cfg']['NumFavoriteTables'] > 0): ?>
         <td class="center print_ignore">
+            <?php
+            // Check if current table is already in favorite list.
+            $favParams = array('db' => $db,
+                'ajax_request' => true,
+                'favorite_table' => $current_table['TABLE_NAME'],
+                (($already_favorite ? 'remove' : 'add') . '_favorite') => true
+            );
+            ?>
             <?= PhpMyAdmin\Template::get('database/structure/favorite_anchor')->render(
                 array(
-                    'db' => $db,
-                    'current_table' => $current_table,
+                    'table_name_hash' => md5($current_table['TABLE_NAME']),
+                    'db_table_name_hash' => md5($db . "." . $current_table['TABLE_NAME']),
+                    'fav_params' => $favParams,
+                    'already_favorite' => $already_favorite,
                     'titles' => $titles,
-                    'already_favorite' => $already_favorite
                 )
             ); ?>
         </td>