Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-24 08:19:53 +01:00
Code Issues Packages Projects Releases Activity

Merge r21833 to 5.0-stable (#37268).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21847 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu
2022-09-26 21:44:06 +00:00
parent 06308f5bdf
commit cecbd9cd73
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/query.rb
View File

@@ -1159,12 +1159,13 @@ class Query < ActiveRecord::Base
if /[<>]/.match?(operator)
where = "(#{where}) AND #{db_table}.#{db_field} <> ''"
end
"#{queried_table_name}.#{customized_key} #{not_in} IN (" \
"SELECT #{customized_class.table_name}.id FROM #{customized_class.table_name}" \
"#{not_in} EXISTS (" \
"SELECT ct.id FROM #{customized_class.table_name} ct" \
" LEFT OUTER JOIN #{db_table} ON #{db_table}.customized_type='#{customized_class}'" \
" AND #{db_table}.customized_id=#{customized_class.table_name}.id" \
" AND #{db_table}.customized_id=ct.id" \
" AND #{db_table}.custom_field_id=#{custom_field_id}" \
" WHERE (#{where}) AND (#{filter[:field].visibility_by_project_condition}))"
" WHERE #{queried_table_name}.#{customized_key} = ct.id AND " \
" (#{where}) AND (#{filter[:field].visibility_by_project_condition}))"
end
def sql_for_chained_custom_field(field, operator, value, custom_field_id, chained_custom_field_id)