From 4003fdfcfcf0ae051677a5765cf7fa37ed8d969b Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Wed, 24 May 2023 18:18:23 +0200
Subject: [PATCH] globalSearch: defaulty display extraDisplayedColumns

The new globalSearch_extraDisplayedColumns parameter permit to control
it for each LSobject types.
---
 doc/conf/LSobject.docbook                     | 11 +++++++++
 src/includes/routes.php                       |  4 ++++
 .../default/global_search_one_page.tpl        | 23 +++++++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/doc/conf/LSobject.docbook b/doc/conf/LSobject.docbook
index 76550380..75b719ae 100644
--- a/doc/conf/LSobject.docbook
+++ b/doc/conf/LSobject.docbook
@@ -69,6 +69,7 @@
   ), // fin LSsearch
 
   'globalSearch' => [booleen],
+  'globalSearch_extraDisplayedColumns' => [booleen],
 
   // ioFormat
   'ioFormat' => array (
@@ -274,6 +275,16 @@
   </listitem>
 </varlistentry>
 
+<varlistentry>
+  <term>globalSearch_extraDisplayedColumns</term>
+  <listitem>
+    <simpara>Afficher ou non les colonnes supplémentaires pour ce type d'objet dans le résultat des
+    recherches globales (Par défaut : <literal>True</literal>). Pour plus de détails les colonnes
+    supplémentaires, <link linkend="config-LSobject-LSsearch">voir la section dédiée</link>.
+    </simpara>
+  </listitem>
+</varlistentry>
+
 <varlistentry>
   <term>ioFormat</term>
   <listitem>
diff --git a/src/includes/routes.php b/src/includes/routes.php
index fbff8d77..35be006b 100644
--- a/src/includes/routes.php
+++ b/src/includes/routes.php
@@ -177,6 +177,10 @@ function handle_global_search($request) {
     LStemplate :: assign('pagetitle', $object -> getLabel());
 
     $LSsearch = new LSsearch($LSobject, 'LSview');
+    $LSsearch -> setParam(
+      'extraDisplayedColumns',
+      LSconfig::get("LSobjects.$LSobject.globalSearch_extraDisplayedColumns", true, 'bool')
+    );
     $LSsearch -> setParamsFromRequest();
 
     $LSsearch -> run();
diff --git a/src/templates/default/global_search_one_page.tpl b/src/templates/default/global_search_one_page.tpl
index 0ca90cfe..fd97c699 100644
--- a/src/templates/default/global_search_one_page.tpl
+++ b/src/templates/default/global_search_one_page.tpl
@@ -34,12 +34,35 @@
         {/if}
         </th>
       {/if}
+      {if $LSsearch->extraDisplayedColumns}
+        {foreach from=$LSsearch->visibleExtraDisplayedColumns item=conf key=cid}
+        <th class='LSobject-list'{if isset($conf.cssStyle) && $conf.cssStyle} style='{$conf.cssStyle|escape:"htmlall"}'{/if}>
+        {if $LSsearch->sort}
+          <a href='object/{$LSsearch->LSobject|escape:"url"}?sortBy={$cid|escape:"url"}&amp;nocache={$smarty.now}'>
+          {if $LSsearch->sortBy == $cid}
+            <strong>{tr msg=$conf.label|escape:"htmlall"}</strong>
+            <img src='{img name=$LSsearch->sortDirection}' class='LSobject-list-ordersense' alt='{$LSsearch->sortDirection}'/>
+          {else}
+            {tr msg=$conf.label}
+          {/if}
+          </a>
+        {else}
+          {tr msg=$conf.label}
+        {/if}
+        </th>
+        {/foreach}
+      {/if}
       <th class='LSobject-list'>{$LSsearch->label_actions}</th>
     </tr>
     {foreach from=$page.list item=object}
     <tr class='{cycle values="LSobject-list,LSobject-list LSobject-list-bis"}'>
         <td class='LSobject-list LSobject-list-names'><a href='object/{$LSsearch->LSobject|escape:'url'}/{$object->dn|escape:'url'}'  class='LSobject-list'>{$object->displayName|escape:'htmlall'}</a> </td>
         {if $LSsearch->displaySubDn}<td class='LSobject-list'>{$object->subDn|escape:'htmlall'}</td>{/if}
+        {if $LSsearch->extraDisplayedColumns}
+          {foreach from=$LSsearch->visibleExtraDisplayedColumns item=conf key=cid}
+          <td class='LSobject-list'{if isset($conf.cssStyle) && $conf.cssStyle} style='{$conf.cssStyle|escape:"htmlall"}'{/if}>{if !isset($conf.escape) || $conf.escape}{$object->$cid|escape:"htmlall"}{else}{$object->$cid}{/if}</td>
+          {/foreach}
+        {/if}
         <td class='LSobject-list LSobject-list-actions'>
         {foreach from=$object->actions item=item}
           <a href='{$item.url|escape:'quotes'}'  class='LSobject-list-actions'><img src='{img name=$item.action|escape:'url'}' alt='{$item.label|escape:'quotes'}' title='{$item.label|escape:'quotes'}'/></a>