vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(calendar): Use Event Participants in query iff referenced in filters

Browse source
This commit is contained in:
Aditya Hase 2019-08-29 15:41:22 +05:30
parent 2db51be19a
commit bf717cf832
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
frappe/desk/doctype/event/event.py
View file

@ -148,6 +148,12 @@ def get_events(start, end, user=None, for_reminder=False, filters=None):
if isinstance(filters, string_types):
filters = json.loads(filters)
filter_condition = get_filters_cond('Event', filters, [])
tables = ["`tabEvent`"]
if "`tabEvent Participants`" in filter_condition:
tables.append("`tabEvent Participants`")
events = frappe.db.sql("""
SELECT `tabEvent`.name,
`tabEvent`.subject,
@ -168,7 +174,7 @@ def get_events(start, end, user=None, for_reminder=False, filters=None):
`tabEvent`.friday,
`tabEvent`.saturday,
`tabEvent`.sunday
FROM `tabEvent`, `tabEvent Participants`
FROM {tables}
WHERE (
(
(date(`tabEvent`.starts_on) BETWEEN date(%(start)s) AND date(%(end)s))
@ -199,7 +205,8 @@ def get_events(start, end, user=None, for_reminder=False, filters=None):
)
AND `tabEvent`.status='Open'
ORDER BY `tabEvent`.starts_on""".format(
filter_condition=get_filters_cond('Event', filters, []),
tables=", ".join(tables),
filter_condition=filter_condition,
reminder_condition="AND coalesce(`tabEvent`.send_reminder, 0)=1" if for_reminder else ""
), {
"start": start,