From fe4f6148c21b94dd5f5ebea763ce3778e9fb0151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 6 Oct 2017 20:49:22 -0300 Subject: [PATCH] Port table/search/search_and_replace to Twig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MaurĂ­cio Meneghini Fauth --- .../classes/Twig/PhpFunctionsExtension.php | 1 + .../table/search/search_and_replace.phtml | 29 ------------------- .../table/search/search_and_replace.twig | 25 ++++++++++++++++ templates/table/search/selection_form.phtml | 5 ++-- 4 files changed, 29 insertions(+), 31 deletions(-) delete mode 100644 templates/table/search/search_and_replace.phtml create mode 100644 templates/table/search/search_and_replace.twig diff --git a/libraries/classes/Twig/PhpFunctionsExtension.php b/libraries/classes/Twig/PhpFunctionsExtension.php index ab054317a1..78c77ecd25 100644 --- a/libraries/classes/Twig/PhpFunctionsExtension.php +++ b/libraries/classes/Twig/PhpFunctionsExtension.php @@ -27,6 +27,7 @@ class PhpFunctionsExtension extends Twig_Extension return array( new Twig_SimpleFunction('array_search', 'array_search'), new Twig_SimpleFunction('md5', 'md5'), + new Twig_SimpleFunction('preg_replace', 'preg_replace'), ); } } diff --git a/templates/table/search/search_and_replace.phtml b/templates/table/search/search_and_replace.phtml deleted file mode 100644 index 714b0198db..0000000000 --- a/templates/table/search/search_and_replace.phtml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - -
-render( - array( - 'html_field_name' => 'useRegex', - 'label' => __('Use regular expression'), - 'checked' => false, - 'onclick' => false, - 'html_field_id' => 'useRegex', - ) -); ?> diff --git a/templates/table/search/search_and_replace.twig b/templates/table/search/search_and_replace.twig new file mode 100644 index 0000000000..cddd580661 --- /dev/null +++ b/templates/table/search/search_and_replace.twig @@ -0,0 +1,25 @@ +{% trans 'Find:' %} + +{% trans 'Replace with:' %} + + +{% trans 'Column:' %} + + +{% include 'checkbox.twig' with { + 'html_field_id': 'useRegex', + 'html_field_name': 'useRegex', + 'label': 'Use regular expression'|trans, + 'checked': false, + 'onclick': false +} only %} diff --git a/templates/table/search/selection_form.phtml b/templates/table/search/selection_form.phtml index 792f266e89..b2e95861bd 100644 --- a/templates/table/search/selection_form.phtml +++ b/templates/table/search/selection_form.phtml @@ -90,8 +90,9 @@ switch ($searchType) { render(array( - 'columnNames' => $columnNames, - 'columnTypes' => $columnTypes + 'column_names' => $columnNames, + 'column_types' => $columnTypes, + 'sql_types' => $GLOBALS['PMA_Types'], )); ?>