summaryrefslogtreecommitdiffstats
path: root/app/models/project_query.rb
diff options
context:
space:
mode:
authorMarius Balteanu <marius.balteanu@zitec.com>2024-11-29 07:49:15 +0000
committerMarius Balteanu <marius.balteanu@zitec.com>2024-11-29 07:49:15 +0000
commitfdc9210e2160980a8b193e84df7357fcbe01f5f7 (patch)
tree59391f363882c6a59608cbb273d51195b5e474e6 /app/models/project_query.rb
parent860c3fadb25aabf85ab06d46460225036868c752 (diff)
downloadredmine-fdc9210e2160980a8b193e84df7357fcbe01f5f7.tar.gz
redmine-fdc9210e2160980a8b193e84df7357fcbe01f5f7.zip
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
Diffstat (limited to 'app/models/project_query.rb')
-rw-r--r--app/models/project_query.rb4
1 files changed, 3 insertions, 1 deletions
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)