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

[fix] Calendar colors

Browse source 
- frappe/erpnext#8455
This commit is contained in:
Faris Ansari 2017-04-14 16:30:48 +05:30 • committed by Nabin Hait
parent 0157ee6f22
commit de59f01ff8
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -225,15 +225,15 @@ frappe.views.Calendar = Class.extend({
let color;
if(me.get_css_class) {
color = me.color_map[me.get_css_class(d)];
// if invalid, fallback to blue color
if(!Object.values(me.color_map).includes(color)) {
color = "blue";
}
} else {
// color field can be set in {doctype}_calendar.js
// see event_calendar.js
color = d.color;
}
// if invalid, fallback to blue color
if(!Object.values(me.color_map).includes(color)) {
color = "blue";
}
d.className = "fc-bg-" + color;
return d;
});