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

Set the "Allow ignore conflicts" default option to "Yes, only users with direct booking permission", therefore this would be the selected as first time installation, unless it set to another choice from Resources site configuration

Browse Source
This commit is contained in:
Hadi Nategh 2014-01-29 08:28:53 +00:00
parent a8e8f33ff4
commit 70c3ab98af
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -1795,7 +1795,7 @@ class calendar_uiforms extends calendar_ui
$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('Scheduling conflict'); $GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('Scheduling conflict');
$resources_config = config::read('resources'); $resources_config = config::read('resources');
$readonlys = array(); $readonlys = array();
if($event['participant_types']['r'] && $resources_config) if($event['participant_types']['r'] && $resources_config) // resources Allow ignore conflicts
{ {
switch ($resources_config['ignoreconflicts']) switch ($resources_config['ignoreconflicts'])
@ -1806,17 +1806,17 @@ class calendar_uiforms extends calendar_ui
case 'allusers': case 'allusers':
$readonlys['button[ignore]'] = false; $readonlys['button[ignore]'] = false;
break; break;
case 'directbooking': default:
foreach ($event['participants'] as $pIds => $val) foreach ($event['participants'] as $pIds => $val)
{ {
if ($val != 'ACHAIR') if ($val != 'ACHAIR')
{ {
if ($this->bo->check_status_perms($pIds, $event)) if (!$this->bo->check_status_perms($pIds, $event))
{ {
$readonlys['button[ignore]'] = true; $readonlys['button[ignore]'] = true;
break; break;
} }
} }
} }
} }

4
resources/templates/default/config.tpl
View File

@ -29,9 +29,9 @@
</td> </td>
<td> <td>
<select name="newsettings[ignoreconflicts]"> <select name="newsettings[ignoreconflicts]">
<option value=""{selected_ignoreconflicts_directbooking}>{lang_Yes,_only_users_with_direct_booking_permission}</option>
<option value="allusers"{selected_ignoreconflicts_allusers}>{lang_Yes,_all_users_can_ignore_conflicts}</option>
<option value="no">{lang_No}</option> <option value="no">{lang_No}</option>
<option value="allusers"{selected_ignoreconflicts_allusers}>{lang_Yes,_all_users_ignore_conflicts}</option>
<option value="directbooking"{selected_ignoreconflicts_directbooking}>{lang_Yes,_only_users_with_direct_booking_permission}</option>
</select> </select>
</td> </td>
</tr> </tr>