diff --git a/lib/ProductOpener/Display.pm b/lib/ProductOpener/Display.pm index 898bdf9159188..1c3081681902b 100644 --- a/lib/ProductOpener/Display.pm +++ b/lib/ProductOpener/Display.pm @@ -2596,6 +2596,11 @@ HTML $extra_column_searchable .= ', {"searchable": false}'; } + # additive table has an extra column for risks + if ($tagtype eq 'additives') { + $extra_column_searchable .= ', {"searchable": false}'; + } + $request_ref->{initjs} .= <debug("PAGINATION: START\n", {count => $count, limit => $limit, page => $page}) if $log->is_debug(); @@ -5982,29 +5986,7 @@ sub display_pagination ($request_ref, $count, $limit, $page) { . "\n"; } - # Close the list - - if (defined single_param("jqm")) { - if (defined $next_page_url) { - my $loadmore = lang("loadmore"); - $html .= <$loadmore -HTML - ; - } - else { - $html .= '

'; - } - } - - if (not defined $request_ref->{jqm_loadmore}) { - $html .= "\n"; - } - - if (not defined single_param("jqm")) { - $html .= $html_pages; - } - return $html; + return $html_pages; } sub search_and_export_products ($request_ref, $query_ref, $sort_by) { diff --git a/templates/web/common/includes/donate_banner.tt.html b/templates/web/common/includes/donate_banner.tt.html index 2aeac2679288d..3ad09a5fbe364 100644 --- a/templates/web/common/includes/donate_banner.tt.html +++ b/templates/web/common/includes/donate_banner.tt.html @@ -13,8 +13,8 @@
open food facts logo @@ -117,8 +117,8 @@

[% lang("donation_title_2024") %]

open food facts logo diff --git a/templates/web/common/site_layout.tt.html b/templates/web/common/site_layout.tt.html index 37610d504a17a..954a885d12eee 100644 --- a/templates/web/common/site_layout.tt.html +++ b/templates/web/common/site_layout.tt.html @@ -26,9 +26,11 @@ [% lang("css") %] [% styles %] - [% analytics %] + + [% analytics %] +
diff --git a/tests/integration/expected_test_results/api_v2_product_read/get-auth-bad-user-password.html b/tests/integration/expected_test_results/api_v2_product_read/get-auth-bad-user-password.html index cf9313eb890f5..92a9476219318 100644 --- a/tests/integration/expected_test_results/api_v2_product_read/get-auth-bad-user-password.html +++ b/tests/integration/expected_test_results/api_v2_product_read/get-auth-bad-user-password.html @@ -35,7 +35,10 @@ - + + + +