Fully qualify column names
This commit is contained in:
parent
489566a39e
commit
a8e997dbf6
|
@ -36,9 +36,9 @@ class CalendarsController < ApplicationController
|
||||||
if @query.valid?
|
if @query.valid?
|
||||||
events = []
|
events = []
|
||||||
events += @query.issues(:include => [:tracker, :assigned_to, :priority],
|
events += @query.issues(:include => [:tracker, :assigned_to, :priority],
|
||||||
:conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
|
:conditions => ["((#{Issue.table_name}.start_date BETWEEN ? AND ?) OR (#{Issue.table_name}.due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
|
||||||
)
|
)
|
||||||
events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
|
events += @query.versions(:conditions => ["#{Version.table_name}.effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
|
||||||
|
|
||||||
@calendar.events = events
|
@calendar.events = events
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue