gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17556 from pokemaobr/REMOVING_FOREIGN_DATA_FROM_TWIG

Browse Source 
Removing Foreign Data from Twig
This commit is contained in:
Maurício Meneghini Fauth 2022-05-24 16:17:56 -03:00 committed by GitHub
commit 710cde8966
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/classes/Controllers/Table/ZoomSearchController.php
View File

@ -371,10 +371,11 @@ class ZoomSearchController extends AbstractController
$column_names_hashes = [];
$foreignDropdown = [];
$searchColumnInForeigners = [];
$foreignData = [];
foreach ($this->columnNames as $columnIndex => $columnName) {
$column_names_hashes[$columnName] = md5($columnName);
$foreignData = $this->relation->getForeignData($this->foreigners, $columnName, false, '', '');
$foreignData[$columnIndex] = $this->relation->getForeignData($this->foreigners, $columnName, false, '', '');
$searchColumnInForeigners[$columnIndex] = $this->relation->searchColumnInForeigners(
$this->foreigners,
$columnName
@ -382,15 +383,15 @@ class ZoomSearchController extends AbstractController
if (
! $this->foreigners
|| ! $searchColumnInForeigners[$columnIndex]
|| ! is_array($foreignData['disp_row'])
|| ! is_array($foreignData[$columnIndex]['disp_row'])
) {
continue;
}
$foreignDropdown[$columnIndex] = $this->relation->foreignDropdown(
$foreignData['disp_row'],
$foreignData['foreign_field'],
$foreignData['foreign_display'],
$foreignData[$columnIndex]['disp_row'],
(string) $foreignData[$columnIndex]['foreign_field'],
$foreignData[$columnIndex]['foreign_display'],
'',
$GLOBALS['cfg']['ForeignKeyMaxLimit']
);
@ -410,6 +411,7 @@ class ZoomSearchController extends AbstractController
'zoom_submit' => isset($_POST['zoom_submit']),
'foreign_dropdown' => $foreignDropdown,
'search_columns_in_foreigners' => $searchColumnInForeigners,
'foreign_data' => $foreignData,
]);
}

4
libraries/classes/Twig/RelationExtension.php
View File

@ -20,10 +20,6 @@ class RelationExtension extends AbstractExtension
$relation = new Relation($GLOBALS['dbi']);
return [
new TwigFunction(
'get_foreign_data',
[$relation, 'getForeignData']
),
new TwigFunction(
'get_tables',
[$relation, 'getTables']

3
templates/table/zoom_search/result_form.twig
View File

@ -40,7 +40,6 @@
<tbody>
{% for column_index in 0..column_names|length - 1 %}
{% set field_popup = column_names[column_index] %}
{% set foreign_data = get_foreign_data(foreigners, field_popup, false, '', '') %}
<tr class="noclick">
<th>{{ column_names[column_index] }}</th>
{# Null checkbox if column can be null #}
@ -59,7 +58,7 @@
'foreigners': foreigners,
'column_name': field_popup,
'column_name_hash': column_name_hashes[field_popup],
'foreign_data': foreign_data,
'foreign_data': foreign_data[column_index],
'table': table,
'column_index': column_index,
'foreign_max_limit': foreign_max_limit,