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

* Calendar - always show non-blocking icon for non-blocking events, regardless of private flag

Browse Source
This commit is contained in:
nathangray 2018-03-02 10:55:06 -07:00
parent 9a51ad9211
commit 3e7ecbe692
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/js/et2_widget_event.js
View File

@ -620,10 +620,6 @@ var et2_calendar_event = (function(){ "use strict"; return et2_valueWidget.exten
*/ */
} }
if(this.options.value.non_blocking)
{
icons.push('<img src="'+this.egw().image('nonblocking','calendar')+'" title="'+this.egw().lang('non blocking')+'"/>');
}
if(this.options.value.alarm && !jQuery.isEmptyObject(this.options.value.alarm) && !this.options.value.is_private) if(this.options.value.alarm && !jQuery.isEmptyObject(this.options.value.alarm) && !this.options.value.is_private)
{ {
icons.push('<img src="'+this.egw().image('alarm','calendar')+'" title="'+this.egw().lang('alarm')+'"/>'); icons.push('<img src="'+this.egw().image('alarm','calendar')+'" title="'+this.egw().lang('alarm')+'"/>');
@ -633,6 +629,12 @@ var et2_calendar_event = (function(){ "use strict"; return et2_valueWidget.exten
icons.push('<img src="'+this.egw().image('needs-action','calendar')+'" title="'+this.egw().lang('Needs action')+'"/>'); icons.push('<img src="'+this.egw().image('needs-action','calendar')+'" title="'+this.egw().lang('Needs action')+'"/>');
} }
} }
// Always include non-blocking, regardless of privacy
if(this.options.value.non_blocking)
{
icons.push('<img src="'+this.egw().image('nonblocking','calendar')+'" title="'+this.egw().lang('non blocking')+'"/>');
}
return icons; return icons;
}, },