Redmine 4.1.7
This commit is contained in:
parent
55458d3479
commit
3ca3c37487
103 changed files with 2426 additions and 431 deletions
|
@ -513,7 +513,8 @@ class IssueQuery < Query
|
|||
|
||||
def sql_for_fixed_version_status_field(field, operator, value)
|
||||
where = sql_for_field(field, operator, value, Version.table_name, "status")
|
||||
version_ids = versions(:conditions => [where]).map(&:id)
|
||||
version_id_scope = project ? project.shared_versions : Version.visible
|
||||
version_ids = version_id_scope.where(where).pluck(:id)
|
||||
|
||||
nl = operator == "!" ? "#{Issue.table_name}.fixed_version_id IS NULL OR" : ''
|
||||
"(#{nl} #{sql_for_field("fixed_version_id", "=", version_ids, Issue.table_name, "fixed_version_id")})"
|
||||
|
@ -521,7 +522,8 @@ class IssueQuery < Query
|
|||
|
||||
def sql_for_fixed_version_due_date_field(field, operator, value)
|
||||
where = sql_for_field(field, operator, value, Version.table_name, "effective_date")
|
||||
version_ids = versions(:conditions => [where]).map(&:id)
|
||||
version_id_scope = project ? project.shared_versions : Version.visible
|
||||
version_ids = version_id_scope.where(where).pluck(:id)
|
||||
|
||||
nl = operator == "!*" ? "#{Issue.table_name}.fixed_version_id IS NULL OR" : ''
|
||||
"(#{nl} #{sql_for_field("fixed_version_id", "=", version_ids, Issue.table_name, "fixed_version_id")})"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue