extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-08 23:19:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar: use "default" filter for home screen, instead of "all" which shows canceled events too

Browse Source
This commit is contained in:
Ralf Becker 2013-06-27 09:22:24 +00:00
parent 533f141bc2
commit ac40e068b6
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1144,6 +1144,11 @@ class calendar_groupdav extends groupdav_handler
$privileges = parent::current_user_privileges($path, $user); $privileges = parent::current_user_privileges($path, $user);
//error_log(__METHOD__."('$path', $user) parent gave ".array2string($privileges)); //error_log(__METHOD__."('$path', $user) parent gave ".array2string($privileges));
if (!$user || $user == $GLOBALS['egw_info']['user']['account_id'])
{
$privileges['all'] = 'all';
}
if ($this->bo->check_perms(EGW_ACL_FREEBUSY, 0, $user)) if ($this->bo->check_perms(EGW_ACL_FREEBUSY, 0, $user))
{ {
$privileges['read-free-busy'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'read-free-busy', ''); $privileges['read-free-busy'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV, 'read-free-busy', '');

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

@ -5,7 +5,7 @@
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @package calendar * @package calendar
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2005-12 by RalfBecker-At-outdoor-training.de * @copyright (c) 2005-13 by RalfBecker-At-outdoor-training.de
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$ * @version $Id$
*/ */
@ -77,7 +77,7 @@ class calendar_uilist extends calendar_ui
$this->__construct(array( $this->__construct(array(
'date' => $this->bo->date2string($this->bo->now_su), 'date' => $this->bo->date2string($this->bo->now_su),
'cat_id' => 0, 'cat_id' => 0,
'filter' => 'all', 'filter' => 'default',
'owner' => $this->user, 'owner' => $this->user,
'multiple' => 0, 'multiple' => 0,
'view' => $this->bo->cal_prefs['mainscreen_showevents'], 'view' => $this->bo->cal_prefs['mainscreen_showevents'],

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

@ -5,7 +5,7 @@
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @package calendar * @package calendar
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2004-12 by RalfBecker-At-outdoor-training.de * @copyright (c) 2004-13 by RalfBecker-At-outdoor-training.de
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$ * @version $Id$
*/ */
@ -240,7 +240,7 @@ class calendar_uiviews extends calendar_ui
$this->__construct(array( $this->__construct(array(
'date' => $this->bo->date2string($this->bo->now_su), 'date' => $this->bo->date2string($this->bo->now_su),
'cat_id' => 0, 'cat_id' => 0,
'filter' => 'all', 'filter' => 'default',
'owner' => substr($this->cal_prefs['mainscreen_showevents'],0,7) == 'planner' && $this->cal_prefs['planner_start_with_group'] ? 'owner' => substr($this->cal_prefs['mainscreen_showevents'],0,7) == 'planner' && $this->cal_prefs['planner_start_with_group'] ?
$this->cal_prefs['planner_start_with_group'] : $this->user, $this->cal_prefs['planner_start_with_group'] : $this->user,
'multiple' => 0, 'multiple' => 0,
@ -277,6 +277,7 @@ class calendar_uiviews extends calendar_ui
case 'day': case 'day':
return $group_warning.$this->day(true); return $group_warning.$this->day(true);
case 'day4': case 'day4':
return $group_warning.$this->week(4,true); return $group_warning.$this->week(4,true);
} }