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

* Calendar: fixed not savable config "Prevent deleting of entries" as "Yes, users can purge their deleted items"

Browse Source 
renamed from "user_purge" to "userpurge" (without underscore) as config can not handle situation when name and value contains underscores
This commit is contained in:
Ralf Becker 2012-05-15 10:36:01 +00:00
parent 6c160cd3b1
commit ac09e58bea
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/inc/class.calendar_bo.inc.php
View File

@ -1180,10 +1180,10 @@ class calendar_bo
$access = $user == $owner || $grant & $needed $access = $user == $owner || $grant & $needed
&& ($needed == EGW_ACL_FREEBUSY || !$private || $grant & EGW_ACL_PRIVATE); && ($needed == EGW_ACL_FREEBUSY || !$private || $grant & EGW_ACL_PRIVATE);
} }
// do NOT allow users to purge deleted events, if we dont have 'user_purge' enabled // do NOT allow users to purge deleted events, if we dont have 'userpurge' enabled
if ($access && $needed == EGW_ACL_DELETE && $event['deleted'] && if ($access && $needed == EGW_ACL_DELETE && $event['deleted'] &&
!$GLOBALS['egw_info']['user']['apps']['admin'] && $user != $this->user && !$GLOBALS['egw_info']['user']['apps']['admin'] && $user != $this->user &&
$GLOBALS['egw_info']['server']['calendar_delete_history'] != 'user_purge') $GLOBALS['egw_info']['server']['calendar_delete_history'] != 'userpurge')
{ {
$access = false; $access = false;
} }

2
calendar/templates/default/config.tpl
View File

@ -83,7 +83,7 @@
<select name="newsettings[calendar_delete_history]"> <select name="newsettings[calendar_delete_history]">
<option value="">{lang_No}</option> <option value="">{lang_No}</option>
<option value="history"{selected_calendar_delete_history_history}>{lang_Yes,_only_admins_can_purge_deleted_items}</option> <option value="history"{selected_calendar_delete_history_history}>{lang_Yes,_only_admins_can_purge_deleted_items}</option>
<option value="user_purge"{selected_calendar_delete_history_user_purge}>{lang_Yes,_users_can_purge_their_deleted_items}</option> <option value="userpurge"{selected_calendar_delete_history_userpurge}>{lang_Yes,_users_can_purge_their_deleted_items}</option>
</select> </select>
</td> </td>
</tr> </tr>