Extract HTML from mult_submits replace prefix

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Mar 3, 2020 · 06c9db3 · 06c9db3
1 parent 1395cdc
commit 06c9db3
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 67 deletions.
diff --git a/libraries/classes/MultSubmits.php b/libraries/classes/MultSubmits.php
@@ -412,40 +412,6 @@ public function getHtmlForCopyMultipleTables($action, array $urlParams)
         ]);
     }
 
-    /**
-     * Gets HTML for replace_prefix_tbl or copy_tbl_change_prefix
-     *
-     * @param string $action    action type
-     * @param array  $urlParams URL params
-     *
-     * @return string
-     */
-    public function getHtmlForReplacePrefixTable($action, array $urlParams)
-    {
-        $html  = '<form id="ajax_form" action="' . $action . '" method="post">';
-        $html .= Url::getHiddenInputs($urlParams);
-        $html .= '<fieldset class = "input">';
-        $html .= '<table>';
-        $html .= '<tr>';
-        $html .= '<td>' . __('From') . '</td>';
-        $html .= '<td>';
-        $html .= '<input type="text" name="from_prefix" id="initialPrefix">';
-        $html .= '</td>';
-        $html .= '</tr>';
-        $html .= '<tr>';
-        $html .= '<td>' . __('To') . '</td>';
-        $html .= '<td>';
-        $html .= '<input type="text" name="to_prefix" id="newPrefix">';
-        $html .= '</td>';
-        $html .= '</tr>';
-        $html .= '</table>';
-        $html .= '</fieldset>';
-        $html .= '<input type="hidden" name="mult_btn" value="' . __('Yes') . '">';
-        $html .= '</form>';
-
-        return $html;
-    }
-
     /**
      * Gets HTML for add_prefix_tbl
      *

diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
@@ -216,9 +216,10 @@
 
     if ($what == 'replace_prefix_tbl' || $what == 'copy_tbl_change_prefix') {
         $response->disable();
-        $response->addHTML(
-            $multSubmits->getHtmlForReplacePrefixTable($action, $_url_params)
-        );
+        $response->addHTML($template->render('mult_submits/replace_prefix_table', [
+            'action' => $action,
+            'url_params' => $_url_params,
+        ]));
     } elseif ($what == 'add_prefix_tbl') {
         $response->disable();
         $response->addHTML($multSubmits->getHtmlForAddPrefixTable($action, $_url_params));

diff --git a/templates/mult_submits/replace_prefix_table.twig b/templates/mult_submits/replace_prefix_table.twig
@@ -0,0 +1,21 @@
+<form id="ajax_form" action="{{ action|raw }}" method="post">
+  {{ get_hidden_inputs(url_params) }}
+
+  <fieldset class="input">
+    <table>
+      <tr>
+        <td>{% trans 'From' %}</td>
+        <td>
+          <input type="text" name="from_prefix" id="initialPrefix">
+        </td>
+      </tr>
+      <tr>
+        <td>{% trans 'To' %}</td>
+        <td>
+          <input type="text" name="to_prefix" id="newPrefix">
+        </td>
+      </tr>
+    </table>
+  </fieldset>
+  <input type="hidden" name="mult_btn" value="{% trans 'Yes' %}">
+</form>
diff --git a/test/classes/MultSubmitsTest.php b/test/classes/MultSubmitsTest.php
@@ -67,36 +67,6 @@ protected function setUp(): void
         $this->multSubmits = new MultSubmits();
     }
 
-    /**
-     * Test for getHtmlForReplacePrefixTable
-     *
-     * @return void
-     */
-    public function testGetHtmlForReplacePrefixTable()
-    {
-        $action = 'delete_row';
-        $urlParams = ['url_query' => 'PMA_original_url_query'];
-
-        //Call the test function
-        $html = $this->multSubmits->getHtmlForReplacePrefixTable($action, $urlParams);
-
-        //form action
-        $this->assertStringContainsString(
-            '<form id="ajax_form" action="delete_row" method="post">',
-            $html
-        );
-        //$Url::getHiddenInputs
-        $this->assertStringContainsString(
-            Url::getHiddenInputs($urlParams),
-            $html
-        );
-        //from_prefix
-        $this->assertStringContainsString(
-            '<input type="text" name="from_prefix" id="initialPrefix">',
-            $html
-        );
-    }
-
     /**
      * Test for getHtmlForAddPrefixTable
      *