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

Fix missed needs action icon change

Browse Source 
Fix 1/2 hour events show header twice
This commit is contained in:
Nathan Gray 2015-10-19 17:24:21 +00:00
parent 938c991124
commit 6915d76f29
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
calendar/js/et2_widget_event.js
View File

@ -222,8 +222,7 @@ var et2_calendar_event = et2_valueWidget.extend([et2_IDetachedDOM],
var small_height = true;
if(this._parent.display_settings)
{
small_height = event['end_m']-event['start_m'] < 2*this._parent.display_settings.granularity ||
event['end_m'] <= this._parent.display_settings.wd_start || event['start_m'] >= this._parent.display_settings.wd_end;
small_height = event['end_m']-event['start_m'] < this._parent.display_settings.granularity;
}
this.div.attr('data-title', title);
@ -385,7 +384,7 @@ var et2_calendar_event = et2_valueWidget.extend([et2_IDetachedDOM],
}
if(this.options.value.participants[egw.user('account_id')] && this.options.value.participants[egw.user('account_id')][0] == 'U')
{
icons.push('<img src="'+this.egw().image('cnr-pending','calendar')+'" title="'+this.egw().lang('Needs action')+'"/>');
icons.push('<img src="'+this.egw().image('needs-action','calendar')+'" title="'+this.egw().lang('Needs action')+'"/>');
}
}
return icons;