extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-18 11:58:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar - In week view always display name of selected user if not self

Browse Source
This commit is contained in:
nathangray 2018-10-22 10:31:10 -06:00
parent 24b869d61a
commit d36d18a148
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
calendar/js/et2_widget_timegrid.js
View File

@ -1602,6 +1602,17 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
this.owner.set_label(''); this.owner.set_label('');
this.div.removeClass('calendar_TimeGridNoLabel'); this.div.removeClass('calendar_TimeGridNoLabel');
// Check to see if it's our own calendar, with just us showing
if(typeof _owner == 'object' && _owner.length == 1 && _owner[0] == this.egw().user('account_id'))
{
var rowCount = 0;
this._parent.iterateOver(function(widget) {
if(!widget.disabled) rowCount++;
},this, et2_calendar_timegrid);
// Just us, show week number
if(rowCount == 1) _owner = false;
}
if(typeof _owner == 'string' && isNaN(_owner)) if(typeof _owner == 'string' && isNaN(_owner))
{ {
this.set_label(''); this.set_label('');
@ -1610,7 +1621,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
// Label is empty, but give extra space for the owner name // Label is empty, but give extra space for the owner name
this.div.removeClass('calendar_TimeGridNoLabel'); this.div.removeClass('calendar_TimeGridNoLabel');
} }
else if (!_owner || typeof _owner == 'object' && _owner.length) else if (!_owner || typeof _owner == 'object' && _owner.length > 1)
{ {
// Don't show owners if more than one, show week number // Don't show owners if more than one, show week number
this.owner.set_value(''); this.owner.set_value('');