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

Merge pull request #8946 from rohitwaghchaure/get_css_class_color_not_working_in_calendar

Browse source 
fix: Color not working in the calendar
This commit is contained in:
rohitwaghchaure 2019-12-06 13:26:11 +05:30 • committed by GitHub
commit 2411d0c527
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -308,6 +308,7 @@ frappe.views.Calendar = Class.extend({
doctype: this.doctype,
start: this.get_system_datetime(start),
end: this.get_system_datetime(end),
fields: this.fields,
filters: this.list_view.filter_area.get(),
field_map: this.field_map
};
@ -356,9 +357,13 @@ frappe.views.Calendar = Class.extend({
prepare_colors: function(d) {
let color, color_name;
if(this.get_css_class) {
color_name = this.color_map[this.get_css_class(d)];
color_name = frappe.ui.color.validate_hex(color_name) ?
color_name : 'blue';
color_name = this.color_map[this.get_css_class(d)] || 'blue';
if (color_name.startsWith("#")) {
color_name = frappe.ui.color.validate_hex(color_name) ?
color_name : 'blue';
}
d.backgroundColor = frappe.ui.color.get(color_name, 'extra-light');
d.textColor = frappe.ui.color.get(color_name, 'dark');
} else {