diff --git a/install/updates/froxlor/update_0.10.inc.php b/install/updates/froxlor/update_0.10.inc.php index 53770ecd..9b8268e0 100644 --- a/install/updates/froxlor/update_0.10.inc.php +++ b/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'); diff --git a/lib/Froxlor/UI/Listing.php b/lib/Froxlor/UI/Listing.php index 12c9ea20..1fb25c75 100644 --- a/lib/Froxlor/UI/Listing.php +++ b/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, ]; } diff --git a/lib/tablelisting/admin/tablelisting.cronjobs.php b/lib/tablelisting/admin/tablelisting.cronjobs.php index 209adf49..f6742c71 100644 --- a/lib/tablelisting/admin/tablelisting.cronjobs.php +++ b/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'), diff --git a/lib/tablelisting/tablelisting.sslcertificates.php b/lib/tablelisting/tablelisting.sslcertificates.php index ef1b6d81..e161a7e3 100644 --- a/lib/tablelisting/tablelisting.sslcertificates.php +++ b/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', [ diff --git a/templates/Froxlor/table/table.html.twig b/templates/Froxlor/table/table.html.twig index 8d8ce762..5f325438 100644 --- a/templates/Froxlor/table/table.html.twig +++ b/templates/Froxlor/table/table.html.twig @@ -11,10 +11,12 @@ {% else %}
- {% if gSearchText is not empty %} - Filter: {{ gSearchText }} + {% if listing.no_search is not defined or (listing.no_search is defined and listing.no_search == false) %} + {% if gSearchText is not empty %} + Filter: {{ gSearchText }} + {% endif %} + {% endif %} -
@@ -94,6 +96,7 @@ + {% if listing.no_search is not defined or (listing.no_search is defined and listing.no_search == false) %} + {% endif %} {% endmacro %} diff --git a/templates/Froxlor/user/table.html.twig b/templates/Froxlor/user/table.html.twig index 91c1a5e2..5ca36e4f 100644 --- a/templates/Froxlor/user/table.html.twig +++ b/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 %}