Merge pull request #17555 from pokemaobr/REMOVING_SEARCH_COLUMNS_IN_FOREIGNERS_FROM_TWIG

Removing search columns in foreigners from twig

libraries/classes/Controllers/Table/SearchController.php

@@ -374,9 +374,14 @@ class SearchController extends AbstractController
 
         $foreignDropdown = '';
 
+        $searchColumnInForeigners = $this->relation->searchColumnInForeigners(
+            $this->foreigners,
+            $this->columnNames[$column_index]
+        );
+
         if (
             $this->foreigners
-            && $this->relation->searchColumnInForeigners($this->foreigners, $this->columnNames[$column_index])
+            && $searchColumnInForeigners
             && is_array($foreignData['disp_row'])
         ) {
             $foreignDropdown = $this->relation->foreignDropdown(
@@ -405,6 +410,7 @@ class SearchController extends AbstractController
             'db' => $GLOBALS['db'],
             'in_fbs' => true,
             'foreign_dropdown' => $foreignDropdown,
+            'search_column_in_foreigners' => $searchColumnInForeigners,
         ]);
 
         return [

libraries/classes/Controllers/Table/ZoomSearchController.php

@@ -370,13 +370,18 @@ class ZoomSearchController extends AbstractController
 
         $column_names_hashes = [];
         $foreignDropdown = [];
+        $searchColumnInForeigners = [];
 
         foreach ($this->columnNames as $columnIndex => $columnName) {
             $column_names_hashes[$columnName] = md5($columnName);
             $foreignData = $this->relation->getForeignData($this->foreigners, $columnName, false, '', '');
+            $searchColumnInForeigners[$columnIndex] = $this->relation->searchColumnInForeigners(
+                $this->foreigners,
+                $columnName
+            );
             if (
                 ! $this->foreigners
-                || ! $this->relation->searchColumnInForeigners($this->foreigners, $columnName)
+                || ! $searchColumnInForeigners[$columnIndex]
                 || ! is_array($foreignData['disp_row'])
             ) {
                 continue;
@@ -404,6 +409,7 @@ class ZoomSearchController extends AbstractController
             'data_json' => json_encode($data),
             'zoom_submit' => isset($_POST['zoom_submit']),
             'foreign_dropdown' => $foreignDropdown,
+            'search_columns_in_foreigners' => $searchColumnInForeigners,
         ]);
     }
 

libraries/classes/Twig/RelationExtension.php

@@ -28,10 +28,6 @@ class RelationExtension extends AbstractExtension
                 'get_tables',
                 [$relation, 'getTables']
             ),
-            new TwigFunction(
-                'search_column_in_foreigners',
-                [$relation, 'searchColumnInForeigners']
-            ),
         ];
     }
 }

templates/table/search/input_box.twig

@@ -1,5 +1,5 @@
 {# Get inputbox based on different column types (Foreign key, geometrical, enum) #}
-{% if foreigners and search_column_in_foreigners(foreigners, column_name) %}
+{% if foreigners and search_column_in_foreigners %}
     {% if foreign_data['disp_row'] is iterable %}
         <select name="criteriaValues[{{ column_index }}]"
             id="{{ column_id }}{{ column_index }}">

templates/table/zoom_search/result_form.twig

@@ -66,7 +66,8 @@
                           'criteria_values': '',
                           'db': db,
                           'in_fbs': false,
-                          'foreign_dropdown': foreign_dropdown[column_index]
+                          'foreign_dropdown': foreign_dropdown[column_index],
+                          'search_columns_in_foreigners': search_columns_in_foreigners[column_index]
                         } only %}
                       </th>
                     </tr>