Fix undefined variables in table/zoom_search/result_form.twig
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
parent
0631cdf07f
commit
4f67631d48
@ -15,6 +15,7 @@ use PhpMyAdmin\Url;
|
||||
use PhpMyAdmin\Util;
|
||||
use PhpMyAdmin\Utils\Gis;
|
||||
|
||||
use function array_map;
|
||||
use function array_search;
|
||||
use function array_values;
|
||||
use function count;
|
||||
@ -377,6 +378,10 @@ class ZoomSearchController extends AbstractController
|
||||
$column_names_hashes[$columnName] = md5($columnName);
|
||||
}
|
||||
|
||||
$columnDataTypes = array_map(static function (string $type): string {
|
||||
return strtoupper((string) preg_replace('@\(.*@s', '', $type));
|
||||
}, $this->columnTypes);
|
||||
|
||||
$this->render('table/zoom_search/result_form', [
|
||||
'db' => $this->db,
|
||||
'table' => $this->table,
|
||||
@ -385,6 +390,7 @@ class ZoomSearchController extends AbstractController
|
||||
'foreigners' => $this->foreigners,
|
||||
'column_null_flags' => $this->columnNullFlags,
|
||||
'column_types' => $this->columnTypes,
|
||||
'column_data_types' => $columnDataTypes,
|
||||
'goto' => $goto,
|
||||
'data' => $data,
|
||||
'data_json' => json_encode($data),
|
||||
|
||||
@ -4485,16 +4485,6 @@ parameters:
|
||||
count: 1
|
||||
path: libraries/classes/Image/ImageWrapper.php
|
||||
|
||||
-
|
||||
message: "#^Method PhpMyAdmin\\\\Image\\\\ImageWrapper\\:\\:height\\(\\) should return int but returns int\\|false\\.$#"
|
||||
count: 1
|
||||
path: libraries/classes/Image/ImageWrapper.php
|
||||
|
||||
-
|
||||
message: "#^Method PhpMyAdmin\\\\Image\\\\ImageWrapper\\:\\:width\\(\\) should return int but returns int\\|false\\.$#"
|
||||
count: 1
|
||||
path: libraries/classes/Image/ImageWrapper.php
|
||||
|
||||
-
|
||||
message: "#^Method PhpMyAdmin\\\\Import\\:\\:analyzeTable\\(\\) has parameter \\$table with no value type specified in iterable type array\\.$#"
|
||||
count: 1
|
||||
|
||||
@ -18,10 +18,10 @@
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<form method="post" action="{{ url('/table/zoom-search') }}" name="insertForm" id="zoom_search_form" class="ajax lock-page">
|
||||
<form method="post" action="{{ url('/table/zoom-search', {'db': db, 'table': table}) }}" name="insertForm" id="zoom_search_form" class="ajax lock-page">
|
||||
{{ get_hidden_inputs(db, table) }}
|
||||
<input type="hidden" name="goto" value="{{ goto }}">
|
||||
<input type="hidden" name="back" value="{{ url('/table/zoom-search') }}">
|
||||
<input type="hidden" name="back" value="{{ url('/table/zoom-search', {'db': db, 'table': table}) }}">
|
||||
|
||||
<div class="card mb-3">
|
||||
<div class="card-header">{% trans 'Do a "query by example" (wildcard: "%") for two different columns' %}</div>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<form method="post" action="{{ url('/table/zoom-search') }}" name="displayResultForm" id="zoom_display_form" class="ajax">
|
||||
<form method="post" action="{{ url('/table/zoom-search', {'db': db, 'table': table}) }}" name="displayResultForm" id="zoom_display_form" class="ajax">
|
||||
{{ get_hidden_inputs(db, table) }}
|
||||
<input type="hidden" name="goto" value="{{ goto }}">
|
||||
<input type="hidden" name="back" value="{{ url('/table/zoom-search') }}">
|
||||
<input type="hidden" name="back" value="{{ url('/table/zoom-search', {'db': db, 'table': table}) }}">
|
||||
|
||||
<div class="card">
|
||||
<div class="card-header">{% trans 'Browse/Edit the points' %}</div>
|
||||
@ -19,8 +19,8 @@
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="dataPointModal" tabindex="-1" aria-labelledby="dataPointModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal fade" id="dataPointModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="dataPointModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog modal-lg modal-dialog-scrollable">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title" id="dataPointModalLabel">{% trans 'Loading' %}</h5>
|
||||
@ -54,11 +54,13 @@
|
||||
{% include 'table/search/input_box.twig' with {
|
||||
'str': '',
|
||||
'column_type': column_types[column_index],
|
||||
'column_data_type': column_data_types[column_index],
|
||||
'html_attributes': '',
|
||||
'column_id': column_types[column_index] ? 'edit_fieldID_' : 'fieldID_',
|
||||
'in_zoom_search_edit': true,
|
||||
'foreigners': foreigners,
|
||||
'column_name': field_popup,
|
||||
'column_name_hash': column_name_hashes[field_popup],
|
||||
'column_name_hash': column_names_hashes[field_popup],
|
||||
'foreign_data': foreign_data,
|
||||
'table': table,
|
||||
'column_index': column_index,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user