extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Fix event category colors

Browse Source
This commit is contained in:
nathan 2022-07-12 09:41:13 -06:00
parent 97019379d8
commit 9a40db5e51
1 changed files with 43 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
calendar/js/et2_widget_event.ts
View File

@ -13,7 +13,7 @@
/etemplate/js/et2_core_valueWidget;
*/
import {et2_createWidget, et2_register_widget, et2_widget, WidgetConfig} from "../../api/js/etemplate/et2_core_widget";
import {et2_register_widget, et2_widget, WidgetConfig} from "../../api/js/etemplate/et2_core_widget";
import {et2_valueWidget} from "../../api/js/etemplate/et2_core_valueWidget";
import {ClassWithAttributes} from "../../api/js/etemplate/et2_core_inheritance";
import {et2_action_object_impl, et2_DOMWidget} from "../../api/js/etemplate/et2_core_DOMWidget";
@ -23,11 +23,13 @@ import {et2_IDetachedDOM} from "../../api/js/etemplate/et2_core_interfaces";
import {et2_activateLinks, et2_insertLinkText, et2_no_init} from "../../api/js/etemplate/et2_core_common";
import {egw_getAppObjectManager, egwActionObject} from '../../api/js/egw_action/egw_action.js';
import {egw} from "../../api/js/jsapi/egw_global";
import {et2_selectbox} from "../../api/js/etemplate/et2_widget_selectbox";
import {et2_container} from "../../api/js/etemplate/et2_core_baseWidget";
import {Et2Dialog} from "../../api/js/etemplate/Et2Dialog/Et2Dialog";
import {formatDate, formatTime} from "../../api/js/etemplate/Et2Date/Et2Date";
import {ColorTranslator} from "colortranslator";
import {StaticOptions} from "../../api/js/etemplate/Et2Select/StaticOptions";
import {Et2Select} from "../../api/js/etemplate/Et2Select/Et2Select";
import {SelectOption} from "../../api/js/etemplate/Et2Select/FindSelectOptions";
/**
* Class for a single event, displayed in either the timegrid or planner view
@ -294,19 +296,13 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
this._need_actions_linked = !this.options.readonly;
// Make sure category stuff is there
// Fake it to use the cache / call - if already there, these will return
// immediately.
const im = this.getInstanceManager();
et2_selectbox.cat_options({
_type: 'select-cat',
getInstanceManager: function ()
{
return im;
}
},
{application: event.app || 'calendar'}
);
// Make sure category stuff is there by faking a call to cache
let so = new StaticOptions();
so.cached_server_side(<Et2Select><unknown>{
nodeName: "ET2-SELECT-CAT_RO",
egw: () => this.egw()
}, "select-cat", ",,,calendar", true);
// Need cleaning? (DnD helper removes content)
// @ts-ignore
@ -528,18 +524,12 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
let cat_label : (string | string[]) = '';
if(this.options.value.category)
{
const cat = et2_createWidget('select-cat', {'readonly': true}, this);
cat.set_value(this.options.value.category);
cat_label = this.options.value.category.indexOf(',') <= 0 ? cat.span.text() : [];
if (typeof cat_label != 'string')
{
cat.span.children().each(function ()
{
(<string[]>cat_label).push(jQuery(this).text());
});
cat_label = cat_label.join(', ');
}
cat.destroy();
let so = new StaticOptions();
let options = <SelectOption[]>so.cached_server_side(<Et2Select><unknown>{
nodeName: "ET2-SELECT-CAT_RO",
egw: () => this.egw()
}, "select-cat", ",,,calendar", false) || [];
cat_label = options.find((o) => o.value = this.options.value.category)?.label || "";
}
// Activate links in description