holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calendar: Prefer icon from link registry, fall back to app icon if it's not set

Browse Source
This commit is contained in:
nathangray 2021-02-23 11:44:38 -07:00
parent 60a486298c
commit 7b466aed56
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
calendar/js/et2_widget_event.js
View File

@ -498,7 +498,8 @@ var et2_calendar_event = /** @class */ (function (_super) {
} }
else { else {
if (this.options.value.app !== 'calendar') { if (this.options.value.app !== 'calendar') {
icons.push('<img src="' + this.egw().image('navbar', this.options.value.app) + '" title="' + this.egw().lang(this.options.value.app) + '"/>'); var app_icon = "" + (egw.link_get_registry(this.options.value.app, 'icon') || (this.options.value.app + '/navbar'));
icons.push('<img src="' + this.egw().image(app_icon) + '" title="' + this.egw().lang(this.options.value.app) + '"/>');
} }
if (this.options.value.priority == 3) { if (this.options.value.priority == 3) {
icons.push('<img src="' + this.egw().image('high', 'calendar') + '" title="' + this.egw().lang('high priority') + '"/>'); icons.push('<img src="' + this.egw().image('high', 'calendar') + '" title="' + this.egw().lang('high priority') + '"/>');

3
calendar/js/et2_widget_event.ts
View File

@ -633,7 +633,8 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
{ {
if(this.options.value.app !== 'calendar') if(this.options.value.app !== 'calendar')
{ {
icons.push('<img src="'+this.egw().image('navbar',this.options.value.app)+'" title="'+this.egw().lang(this.options.value.app)+'"/>'); let app_icon = ""+(egw.link_get_registry(this.options.value.app,'icon') || (this.options.value.app + '/navbar'));
icons.push('<img src="'+this.egw().image(app_icon)+'" title="'+this.egw().lang(this.options.value.app)+'"/>');
} }
if(this.options.value.priority == 3) if(this.options.value.priority == 3)
{ {