fix: raise page size limit to 1000 for logged in users (#10407)

openfoodfacts · Jun 6, 2024 · 07773bd · 07773bd
1 parent 74e8062
commit 07773bd
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/lib/ProductOpener/Config_obf.pm b/lib/ProductOpener/Config_obf.pm
@@ -194,6 +194,7 @@ $options{max_recent_changes_page_size} = 1000;
 $options{default_api_products_page_size} = 20;
 $options{default_web_products_page_size} = 50;
 $options{max_products_page_size} = 100;
+$options{max_products_page_size_for_logged_in_users} = 1000;
 
 # List of tags limits
 $options{default_tags_page_size} = 100;

diff --git a/lib/ProductOpener/Config_off.pm b/lib/ProductOpener/Config_off.pm
@@ -213,6 +213,7 @@ $options{max_recent_changes_page_size} = 1000;
 $options{default_api_products_page_size} = 20;
 $options{default_web_products_page_size} = 50;
 $options{max_products_page_size} = 100;
+$options{max_products_page_size_for_logged_in_users} = 1000;
 
 # List of tags limits
 $options{default_tags_page_size} = 100;

diff --git a/lib/ProductOpener/Config_opf.pm b/lib/ProductOpener/Config_opf.pm
@@ -193,6 +193,7 @@ $options{max_recent_changes_page_size} = 1000;
 $options{default_api_products_page_size} = 20;
 $options{default_web_products_page_size} = 50;
 $options{max_products_page_size} = 100;
+$options{max_products_page_size_for_logged_in_users} = 1000;
 
 # List of tags limits
 $options{default_tags_page_size} = 100;

diff --git a/lib/ProductOpener/Config_opff.pm b/lib/ProductOpener/Config_opff.pm
@@ -193,6 +193,7 @@ $options{max_recent_changes_page_size} = 1000;
 $options{default_api_products_page_size} = 20;
 $options{default_web_products_page_size} = 50;
 $options{max_products_page_size} = 100;
+$options{max_products_page_size_for_logged_in_users} = 1000;
 
 # List of tags limits
 $options{default_tags_page_size} = 100;

diff --git a/lib/ProductOpener/Display.pm b/lib/ProductOpener/Display.pm
@@ -878,6 +878,8 @@ sub init_request ($request_ref = {}) {
 		}
 	}
 
+	$request_ref->{user_id} = $User_id;
+
 	# %admin is defined in Config.pm
 	# admins can change permissions for all users
 	if (is_admin_user($User_id)) {
@@ -5001,7 +5003,12 @@ sub search_and_display_products ($request_ref, $query_ref, $sort_by, $limit, $pa
 	}
 
 	# Make sure we are not over the limit
-	if ($limit > $options{max_products_page_size}) {
+	if (defined $request_ref->{user_id}) {
+		if ($limit > $options{max_products_page_size_for_logged_in_users}) {
+			$limit = $options{max_products_page_size_for_logged_in_users};
+		}
+	}
+	elsif ($limit > $options{max_products_page_size}) {
 		$limit = $options{max_products_page_size};
 	}