extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-14 01:48:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed navigation calendar not shown for account-selection pref "none"

Browse Source
This commit is contained in:
Ralf Becker 2014-07-01 15:26:05 +00:00
parent ecccc18d1c
commit b592a5088e
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -756,11 +756,23 @@ class calendar_ui
// Category Selection // Category Selection
$cat_id = explode(',',$this->cat_id); $cat_id = explode(',',$this->cat_id);
$current_view_url = egw::link('/index.php',array(
'menuaction' => $this->view_menuaction,
'date' => $this->date,
)+($this->view == 'listview' ? array('ajax' => 'true') : array()),false);
$select = ' <select style="width: 86%;" id="calendar_cat_id" name="cat_id" title="'. $select = ' <select style="width: 86%;" id="calendar_cat_id" name="cat_id" title="'.
lang('Select a %1',lang('Category')). '"'.($cat_id && count($cat_id) > 1 ? ' multiple=true size=4':''). '>'. lang('Select a %1',lang('Category')). '"'.($cat_id && count($cat_id) > 1 ? ' multiple=true size=4':''). '>'.
'<option value="0">'.lang('All categories').'</option>'. '<option value="0">'.lang('All categories').'</option>'.
$this->categories->formatted_list('select','all',$cat_id,'True'). $this->categories->formatted_list('select','all',$cat_id,'True').
"</select>\n" . html::image('phpgwapi','attach','','id="calendar_cat_id_multiple"'); "</select>\n" . html::image('phpgwapi','attach','','id="calendar_cat_id_multiple"')."
<script type=\"text/javascript\" src=\"{$GLOBALS['egw_info']['server']['webserver_url']}/calendar/js/navigation.js\" id=\"calendar-navigation-script\"".
" data-link-day-url =\"".htmlspecialchars($link['day']).
"\" data-link-week-url=\"".htmlspecialchars($link['week']).
"\" data-link-month-url=\"".htmlspecialchars($link['month']).
"\" data-date=\"".htmlspecialchars($flatdate).
"\" data-current-date=\"".htmlspecialchars(egw_time::to('now', 'Ymd')).
"\" data-current-view-url=\"".htmlspecialchars($current_view_url)."\"/></script>\n";
$file[++$n] = array( $file[++$n] = array(
'text' => $select, 'text' => $select,
@ -779,20 +791,8 @@ class calendar_ui
} }
// we no longer exclude non-accounts from the account-selection: it shows all types of participants // we no longer exclude non-accounts from the account-selection: it shows all types of participants
$accounts = explode(',',$this->owner); $accounts = explode(',',$this->owner);
$current_view_url = egw::link('/index.php',array(
'menuaction' => $this->view_menuaction,
'date' => $this->date,
)+($this->view == 'listview' ? array('ajax' => 'true') : array()),false);
$file[] = array( $file[] = array(
'text' => " 'text' =>
<script type=\"text/javascript\" src=\"{$GLOBALS['egw_info']['server']['webserver_url']}/calendar/js/navigation.js\" id=\"calendar-navigation-script\"".
" data-link-day-url =\"".htmlspecialchars($link['day']).
"\" data-link-week-url=\"".htmlspecialchars($link['week']).
"\" data-link-month-url=\"".htmlspecialchars($link['month']).
"\" data-date=\"".htmlspecialchars($flatdate).
"\" data-current-date=\"".htmlspecialchars(egw_time::to('now', 'Ymd')).
"\" data-current-view-url=\"".htmlspecialchars($current_view_url)."\"/></script>\n".
$this->accountsel->selection('owner','uical_select_owner',$accounts,'calendar+',count($accounts) > 1 ? 4 : 1,False, $this->accountsel->selection('owner','uical_select_owner',$accounts,'calendar+',count($accounts) > 1 ? 4 : 1,False,
' style="width: '.(count($accounts) > 1 && in_array($this->common_prefs['account_selection'],array('selectbox','groupmembers')) ? '86%' : '86%').';"'. ' style="width: '.(count($accounts) > 1 && in_array($this->common_prefs['account_selection'],array('selectbox','groupmembers')) ? '86%' : '86%').';"'.
' title="'.lang('select a %1',lang('user')).'"','',$grants,false,array($this->bo,'participant_name')), ' title="'.lang('select a %1',lang('user')).'"','',$grants,false,array($this->bo,'participant_name')),
@ -833,7 +833,7 @@ class calendar_ui
if ($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir']) if ($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir'])
{ {
$options = ''; $options = '';
$documents = calendar_merge::get_documents($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir'], '', null,'calendar'); $documents = calendar_merge::get_documents($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir'], '', null,'calendar');
foreach($documents as $key => $value) foreach($documents as $key => $value)
{ {