mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-25 20:31:31 +02:00
do not add the planner-default-group to the participants, if add is called from the planner
This commit is contained in:
parent
6e6f4a8363
commit
f0b8ed8280
@ -68,7 +68,15 @@ class uiforms extends uical
|
|||||||
{
|
{
|
||||||
$extra_participants = $_GET['participants'] ? explode(',',$_GET['participants']) : array();
|
$extra_participants = $_GET['participants'] ? explode(',',$_GET['participants']) : array();
|
||||||
|
|
||||||
$owner = isset($_GET['owner']) ? $_GET['owner'] : $this->owner;
|
if (isset($_GET['owner']))
|
||||||
|
{
|
||||||
|
$owner = $_GET['owner'];
|
||||||
|
}
|
||||||
|
// dont set the planner start group as owner/participants if called from planner
|
||||||
|
elseif ($this->view != 'planner' || $this->owner != $this->cal_prefs['planner_start_with_group'])
|
||||||
|
{
|
||||||
|
$owner = $this->owner;
|
||||||
|
}
|
||||||
if (!$owner || !is_numeric($owner) || $GLOBALS['egw']->accounts->get_type($owner) != 'u' ||
|
if (!$owner || !is_numeric($owner) || $GLOBALS['egw']->accounts->get_type($owner) != 'u' ||
|
||||||
!$this->bo->check_perms(EGW_ACL_ADD,0,$owner))
|
!$this->bo->check_perms(EGW_ACL_ADD,0,$owner))
|
||||||
{
|
{
|
||||||
@ -78,7 +86,7 @@ class uiforms extends uical
|
|||||||
}
|
}
|
||||||
$owner = $this->user;
|
$owner = $this->user;
|
||||||
}
|
}
|
||||||
//echo "<p>this->owner=$this->owner, _GET[owner]=$_GET[owner], user=$this->user => owner=$owner</p>\n";
|
//echo "<p>this->owner=$this->owner, _GET[owner]=$_GET[owner], user=$this->user => owner=$owner, extra_participants=".implode(',',$extra_participants)."</p>\n";
|
||||||
|
|
||||||
// by default include the owner as participant (the user can remove him)
|
// by default include the owner as participant (the user can remove him)
|
||||||
$extra_participants[] = $owner;
|
$extra_participants[] = $owner;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user