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

Merge pull request #13586 from leela/fix-calendar-view

Browse source 
fix: Calendar view of a doctype
This commit is contained in:
Leela vadlamudi 2021-06-26 20:57:39 +05:30 • committed by GitHub
commit 8d6bd82eac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/desk/calendar.py
View file

@ -25,7 +25,6 @@ def get_event_conditions(doctype, filters=None):
@frappe.whitelist()
def get_events(doctype, start, end, field_map, filters=None, fields=None):
field_map = frappe._dict(json.loads(field_map))
fields = frappe.parse_json(fields)
@ -36,8 +35,7 @@ def get_events(doctype, start, end, field_map, filters=None, fields=None):
"color": d.fieldname
})
if filters:
filters = json.loads(filters or '')
filters = json.loads(filters) if filters else []
if not fields:
fields = [field_map.start, field_map.end, field_map.title, 'name']
@ -52,5 +50,5 @@ def get_events(doctype, start, end, field_map, filters=None, fields=None):
[doctype, start_date, '<=', end],
[doctype, end_date, '>=', start],
]
fields = list({field for field in fields if field})
return frappe.get_list(doctype, fields=fields, filters=filters)

2
frappe/public/js/frappe/views/calendar/calendar.js
View file

@ -109,7 +109,7 @@ frappe.views.CalendarView = class CalendarView extends frappe.views.ListView {
frappe.views.Calendar = class Calendar {
constructor(options) {
$.extend(this, options);
this.field_map = {
this.field_map = this.field_map || {
"id": "name",
"start": "start",
"end": "end",