dont show search-icon/exclude specific non-searchable fields from overviews

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

install/updates/froxlor/update_0.10.inc.php

@@ -986,7 +986,6 @@ if (Froxlor::isFroxlorVersion('0.10.34.1')) {
 	Froxlor::updateToVersion('0.10.35');
 }
 
-
 if (Froxlor::isFroxlorVersion('0.10.35')) {
 	Update::showUpdateStep("Updating from 0.10.35 to 0.10.35.1", false);
 	Froxlor::updateToVersion('0.10.35.1');

lib/Froxlor/UI/Listing.php

@@ -52,6 +52,7 @@ class Listing
 			'is_search' => $collection->getPagination() instanceof Pagination && $collection->getPagination()->isSearchResult(),
 			'self_overview' => $tabellisting['self_overview'] ?? [],
 			'available_columns' => self::getAvailableColumnsForListing($tabellisting),
+			'no_search' => $tabellisting['no_search'] ?? false,
 			'listing_search_additional_param' => $listing_search_additional_param,
 		];
 	}
@@ -69,7 +70,8 @@ class Listing
 			'pagination' => $collection['pagination'],
 			'empty_msg' => $tabellisting['empty_msg'] ?? null,
 			'self_overview' => $tabellisting['self_overview'] ?? [],
-			'available_columns' => self::getAvailableColumnsForListing($tabellisting)
+			'available_columns' => self::getAvailableColumnsForListing($tabellisting),
+			'no_search' => $tabellisting['no_search'] ?? false,
 		];
 	}
 

lib/tablelisting/admin/tablelisting.cronjobs.php

@@ -31,6 +31,7 @@ return [
 		'title' => lng('admin.cron.cronsettings'),
 		'icon' => 'fa-solid fa-clock-rotate-left',
 		'default_sorting' => ['c.id' => 'asc'],
+		'no_search' => true,
 		'columns' => [
 			'c.desc_lng_key' => [
 				'label' => lng('cron.description'),

lib/tablelisting/tablelisting.sslcertificates.php

@@ -43,18 +43,22 @@ return [
 				'label' => lng('ssl_certificates.certificate_for'),
 				'field' => 'domain',
 				'callback' => [SSLCertificate::class, 'domainWithSan'],
+				'searchable' => false,
 			],
 			'c.issuer' => [
 				'label' => lng('ssl_certificates.issuer'),
 				'field' => 'issuer',
+				'searchable' => false,
 			],
 			'c.validfromdate' => [
 				'label' => lng('ssl_certificates.valid_from'),
 				'field' => 'validfromdate',
+				'searchable' => false,
 			],
 			'c.validtodate' => [
 				'label' => lng('ssl_certificates.valid_until'),
 				'field' => 'validtodate',
+				'searchable' => false,
 			],
 		],
 		'visible_columns' => Listing::getVisibleColumnsForListing('sslcertificates_list', [

templates/Froxlor/table/table.html.twig

@@ -11,10 +11,12 @@
 	{% else %}
 		<div class="d-flex flex-column align-items-end mt-n2">
 			<div class="rounded-top bg-white small py-1 px-2 me-3 opacity-75 text-dark">
+				{% if listing.no_search is not defined or (listing.no_search is defined and listing.no_search == false) %}
 					{% if gSearchText is not empty %}
 						<span class="me-2"><a href="{{ linker(listing.self_overview) }}"><i class="fa-solid fa-xmark"></i></a> Filter: <strong>{{ gSearchText }}</strong></span>
 					{% endif %}
 					<span type="button" data-bs-toggle="modal" data-bs-target="#searchColumnsModal" class="me-2"><i class="fa-solid fa-search"></i></span>
+				{% endif %}
 				<span type="button" data-bs-toggle="modal" data-bs-target="#manageColumnsModal"><i class="fa-solid fa-cog"></i></span>
 			</div>
 		</div>
@@ -94,6 +96,7 @@
 		</div>
 	</div>
 
+	{% if listing.no_search is not defined or (listing.no_search is defined and listing.no_search == false) %}
 	<!-- Modal -->
 	<div class="modal fade" id="searchColumnsModal" tabindex="-1" aria-labelledby="searchColumnsModalLabel" aria-hidden="true">
 		<div class="modal-dialog">
@@ -130,4 +133,5 @@
 			</form>
 		</div>
 	</div>
+	{% endif %}
 {% endmacro %}

templates/Froxlor/user/table.html.twig

@@ -24,7 +24,7 @@
 {% block actions %}
 
 	{% if listing.is_search and listing.self_overview is defined and listing.self_overview is iterable  %}
-		{% set actions_tmp = actions_links %}
+		{% set actions_tmp = actions_links|default([]) %}
 		{% set actions_links = {'href': linker(listing.self_overview), 'icon': 'fa-solid fa-reply','label': lng('panel.backtooverview')} %}
 		{% set actions_links = {actions_links}|merge(actions_tmp) %}
 	{% endif %}