diff options
| author | Go MAEDA <maeda@farend.jp> | 2024-01-03 07:34:06 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2024-01-03 07:34:06 +0000 |
| commit | d42887b579000c8737b9508891e3fe634db86b2a (patch) | |
| tree | 514cc82d31a63df9a5755337d02ba71bcb641e12 /app | |
| parent | 8b0a4fb197906c61788734037240a25817c8ec5d (diff) | |
| download | redmine-d42887b579000c8737b9508891e3fe634db86b2a.tar.gz redmine-d42887b579000c8737b9508891e3fe634db86b2a.zip | |
Merged r22583 from trunk to 5.1-stable (#39991).
git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@22587 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/query.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/query.rb b/app/models/query.rb index 5630f95c7..cedd94b92 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -1276,7 +1276,7 @@ class Query < ActiveRecord::Base sql += " OR #{db_table}.#{db_field} = ''" if is_custom_filter || [:text, :string].include?(type_for(field)) when "*" sql = "#{db_table}.#{db_field} IS NOT NULL" - sql += " AND #{db_table}.#{db_field} <> ''" if is_custom_filter + sql += " AND #{db_table}.#{db_field} <> ''" if is_custom_filter || [:text, :string].include?(type_for(field)) when ">=" if [:date, :date_past].include?(type_for(field)) sql = date_clause(db_table, db_field, parse_date(value.first), nil, is_custom_filter) |