extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-24 20:01:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Respect "Default type of resources selection" preference

Browse Source
This commit is contained in:
Nathan Gray 2015-03-12 15:23:15 +00:00
parent 1db42841cf
commit 5f3f3b3e55
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1466,21 +1466,21 @@ class calendar_uiforms extends calendar_ui
} }
// adding extra content for the resource link-entry widget to // adding extra content for the resource link-entry widget to
// * select resources or addressbook as a default selection on the app selectbox based on prefs // * select resources or addressbook as a default selection on the app selectbox based on prefs
$content['participants']['resource']['default_sel'] = $this->cal_prefs['defaultresource_sel']; $content['participants']['resource']['app'] = $this->cal_prefs['defaultresource_sel'];
// * get informations from the event on the ajax callback // * get informations from the event on the ajax callback
if (in_array($content['participants']['resource']['default_sel'],array('resources_conflict','resources_without_conflict'))) if (in_array($content['participants']['resource']['app'],array('resources_conflict','resources_without_conflict')))
{ {
// fix real app string // fix real app string
$content['participants']['resource']['default_sel'] = 'resources'; $content['participants']['resource']['app'] = 'resources';
// this will be used to get reservation information on the resource select list // this will be used to get reservation information on the resource select list
$content['participants']['resource']['extra'] = "values2url(this.form,'start,end,duration,participants,recur_type,whole_day')". $content['participants']['resource']['extra'] = "values2url(this.form,'start,end,duration,participants,recur_type,whole_day')".
"+'&exec[event_id]=".$content['id']."'"."+'&exec[show_conflict]=". "+'&exec[event_id]=".$content['id']."'"."+'&exec[show_conflict]=".
(($this->cal_prefs['defaultresource_sel'] == 'resources_without_conflict')? '0':'1')."'"; (($this->cal_prefs['defaultresource_sel'] == 'resources_without_conflict')? '0':'1')."'";
} }
// check if current pref. is an allowed application for the user // check if current pref. is an allowed application for the user
if (!isset($GLOBALS['egw_info']['user']['apps'][$content['participants']['resource']['default_sel']])) if (!isset($GLOBALS['egw_info']['user']['apps'][$content['participants']['resource']['app']]))
{ {
$content['participants']['resource']['default_sel'] = 'home-accounts'; $content['participants']['resource']['app'] = 'home-accounts';
} }
} }
$content['participants']['status_date'] = $preserv['actual_date']; $content['participants']['status_date'] = $preserv['actual_date'];