extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-29 01:59:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disable use_time_grid preference in calendar

Browse Source
This commit is contained in:
Hadi Nategh 2014-11-26 13:59:31 +00:00
parent 4d0c75447c
commit d0898a33c3
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/inc/class.calendar_hooks.inc.php
View File

@ -405,7 +405,10 @@ class calendar_hooks
'admin' => False, 'admin' => False,
'forced' => 'user', 'forced' => 'user',
), ),
'use_time_grid' => array( //ATM:Disable the use_time_grid preference
//@TODO: the whole use_time_grid preference should be removed
// after we decided that is not neccessary to have it at all
/*'use_time_grid' => array(
'type' => 'select', 'type' => 'select',
'label' => 'Views with fixed time intervals', 'label' => 'Views with fixed time intervals',
'name' => 'use_time_grid', 'name' => 'use_time_grid',
@ -414,7 +417,7 @@ class calendar_hooks
'xmlrpc' => True, 'xmlrpc' => True,
'admin' => False, 'admin' => False,
'forced' => 'all', 'forced' => 'all',
), ),*/
'link_title' => array( 'link_title' => array(
'type' => 'multiselect', 'type' => 'multiselect',
'label' => 'Link title for events to show', 'label' => 'Link title for events to show',

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

@ -101,8 +101,13 @@ class calendar_uiviews extends calendar_ui
* @var boolean * @var boolean
*/ */
var $use_time_grid=true; var $use_time_grid=true;
/**
* Pref value of use_time_grid preference
* @var string
*/
var $use_time_grid_pref = '';
/** /**
* Can we display the whole day in a timeGrid of the size of the workday and just scroll to workday start * Can we display the whole day in a timeGrid of the size of the workday and just scroll to workday start
* *
@ -170,8 +175,11 @@ class calendar_uiviews extends calendar_ui
$this->holidays = $this->bo->read_holidays($this->year); $this->holidays = $this->bo->read_holidays($this->year);
$this->check_owners_access(); $this->check_owners_access();
//ATM: Forces use_time_grid preference to use all views by ignoring the preference value
//@TODO: the whole use_time_grid preference should be removed (including dependent vars)
// after we decided that is not neccessary to have it at all
$this->use_time_grid_pref = 'all'; //$this->cal_prefs['use_time_grid'];
} }
@ -612,7 +620,7 @@ class calendar_uiviews extends calendar_ui
{ {
if ($this->debug > 0) $this->bo->debug_message('uiviews::month(weeks=%1) date=%2',True,$weeks,$this->date); if ($this->debug > 0) $this->bo->debug_message('uiviews::month(weeks=%1) date=%2',True,$weeks,$this->date);
$this->use_time_grid = !$this->cal_prefs['use_time_grid'] || $this->cal_prefs['use_time_grid'] == 'all'; // all views $this->use_time_grid = !$this->use_time_grid_pref || $this->use_time_grid_pref == 'all'; // all views
// Merge print // Merge print
if($weeks) if($weeks)
@ -791,9 +799,9 @@ class calendar_uiviews extends calendar_ui
*/ */
function week($days=0,$home=false) function week($days=0,$home=false)
{ {
$this->use_time_grid = $days != 4 && !in_array($this->cal_prefs['use_time_grid'],array('day','day4')) || $this->use_time_grid = $days != 4 && !in_array($this->use_time_grid_pref,array('day','day4')) ||
$days == 4 && $this->cal_prefs['use_time_grid'] != 'day'; $days == 4 && $this->use_time_grid_pref != 'day';
if (!$days) if (!$days)
{ {
$days = isset($_GET['days']) ? $_GET['days'] : $this->cal_prefs['days_in_weekview']; $days = isset($_GET['days']) ? $_GET['days'] : $this->cal_prefs['days_in_weekview'];