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

Avoid permission errors by doing nothing when user clicks on event they have no permission to view

Browse Source
This commit is contained in:
Nathan Gray 2016-02-23 22:23:01 +00:00
parent b2d1f0edbe
commit 101742e39b
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/js/et2_widget_timegrid.js
View File

@ -1595,7 +1595,11 @@ var et2_calendar_timegrid = et2_calendar_view.extend([et2_IDetachedDOM, et2_IRes
result = this.onclick.apply(this, args);
}
if(event.id && result && !this.disabled && !this.options.readonly)
var event_node = $j(event.event_node);
if(event.id && result && !this.disabled && !this.options.readonly &&
// Permissions - opening will fail if we try
event_node && !(event_node.hasClass('rowNoView'))
)
{
if(event.widget_id && this.getWidgetById(event.widget_id))
{

2
calendar/templates/default/app.css
View File

@ -584,7 +584,7 @@ Hide subsequent headers in week view with non-consolidated owners
background-color: #808080;
}
.calendar_calEvent:hover{
.calendar_calEvent:not(.rowNoView):hover{
cursor: pointer;
}

5
calendar/templates/pixelegg/app.css
View File

@ -586,7 +586,7 @@ Hide subsequent headers in week view with non-consolidated owners
border-color: #808080;
background-color: #808080;
}
.calendar_calEvent:hover {
.calendar_calEvent:not(.rowNoView):hover {
cursor: pointer;
}
/** Multi-line ellipsis */
@ -1971,9 +1971,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
*/
background-color: #679fd2;
}
.calendar_calEvent:hover {
cursor: pointer;
}
.calendar_calEvent:not([class*=" cat_"]) {
/* Defaults for no category, so we don't override it */
background-color: #679fd2;

3
calendar/templates/pixelegg/app.less
View File

@ -867,9 +867,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
*/
background-color: @egw_color_blue_lightest;
}
.calendar_calEvent:hover{
cursor: pointer;
}
.calendar_calEvent:not([class*=" cat_"]) {
/* Defaults for no category, so we don't override it */
background-color: @egw_color_blue_lightest;