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

Calendar - fix some bugs setting calendar owner via URL when calendar app is not yet loaded

Browse Source
This commit is contained in:
nathangray 2017-06-12 12:35:12 -06:00
parent bf9daa31fa
commit 6cb27a7652
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
calendar/inc/class.calendar_owner_etemplate_widget.inc.php
View File

@ -41,7 +41,10 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
$form_name = self::form_name($cname, $this->id, $expand);
$value =& self::get_array(self::$request->content, $form_name);
if(!is_array($value)) $value = array();
if(!is_array($value))
{
$value = explode(',', $value);
}
if (!is_array(self::$request->sel_options[$form_name]))
{
self::$request->sel_options[$form_name] = array();

1
calendar/inc/class.calendar_ui.inc.php
View File

@ -559,6 +559,7 @@ class calendar_ui
if (!is_array($cont)) $cont = array();
$cont['view'] = $this->view ? $this->view : 'week';
$cont['date'] = $this->date ? $this->date : new Api\DateTime();
$cont['owner'] = $this->owner ? $this->owner : $cont['owner'];
$cont['year'] = (int)Api\DateTime::to($cont['date'],'Y');
$cont['holidays'] = $this->bo->read_holidays($cont['year']);

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

@ -159,6 +159,10 @@ class calendar_uilist extends calendar_ui
{
$content['nm']['search'] = $_GET['search'];
}
if($this->owner)
{
$content['nm']['col_filter']['participant'] = is_array($this->owner) ? $this->owner : explode(',',$this->owner);
}
// search via jdots ajax_exec uses $_REQUEST['json_data'] instead of regular GET parameters
if (isset($_REQUEST['json_data']) && ($json_data = json_decode($_REQUEST['json_data'], true)) &&
!empty($json_data['request']['parameters'][0]))

1
calendar/inc/class.calendar_uiviews.inc.php
View File

@ -144,6 +144,7 @@ class calendar_uiviews extends calendar_ui
'start' => $this->date,
'cat_id' => $this->cat_id ? (is_array($this->cat_id)?$this->cat_id:explode(',',$this->cat_id)) : 0,
'users' => explode(',',$this->owner),
'owner' => explode(',',$this->owner),
'filter' => $this->filter,
'daywise' => True,
'use_so_events' => $this->test === 'true',