From fdc9210e2160980a8b193e84df7357fcbe01f5f7 Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Fri, 29 Nov 2024 07:49:15 +0000 Subject: Merge r23300 from trunk to 6.0-stable (#41791). git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23324 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/project_query.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/models/project_query.rb') diff --git a/app/models/project_query.rb b/app/models/project_query.rb index 6defbcc83..726721bd8 100644 --- a/app/models/project_query.rb +++ b/app/models/project_query.rb @@ -156,7 +156,9 @@ class ProjectQuery < Query order_option << "#{Project.table_name}.lft ASC" scope = base_scope. order(order_option). - joins(joins_for_order_statement(order_option.join(','))) + joins(joins_for_order_statement(order_option.join(','))). + limit(options[:limit]). + offset(options[:offset]) if has_custom_field_column? scope = scope.preload(:custom_values) -- cgit v1.2.3