mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-21 18:31:37 +02:00
fixes so that hr works properly
This commit is contained in:
parent
eb0aa37eaa
commit
7b6c0acbd9
@ -88,8 +88,9 @@
|
|||||||
|
|
||||||
$fields = addressbook_read_last_entry($qfields);
|
$fields = addressbook_read_last_entry($qfields);
|
||||||
$newid = $fields[0]['id'];
|
$newid = $fields[0]['id'];
|
||||||
|
$tid = $fields[0]['tid'];
|
||||||
Header("Location: "
|
Header("Location: "
|
||||||
. $phpgw->link('/addressbook/edit.php',"ab_id=$newid&order=$order&sort=$sort&filter=$filter&start=$start&query=$query&cat_id=$cat_id"));
|
. $phpgw->link('/addressbook/edit.php',"ab_id=$newid&order=$order&sort=$sort&filter=$filter&start=$start&query=$query&cat_id=$cat_id&tid=$tid"));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -81,6 +81,7 @@
|
|||||||
$t->set_var('query',$query);
|
$t->set_var('query',$query);
|
||||||
$t->set_var('start',$start);
|
$t->set_var('start',$start);
|
||||||
$t->set_var('cat_id',$cat_id);
|
$t->set_var('cat_id',$cat_id);
|
||||||
|
$t->set_var('tid',$tid);
|
||||||
$t->set_var('lang_ok',lang('ok'));
|
$t->set_var('lang_ok',lang('ok'));
|
||||||
$t->set_var('lang_clear',lang('clear'));
|
$t->set_var('lang_clear',lang('clear'));
|
||||||
$t->set_var('lang_cancel',lang('cancel'));
|
$t->set_var('lang_cancel',lang('cancel'));
|
||||||
@ -212,7 +213,7 @@
|
|||||||
$userid = $phpgw_info['user']['account_id'];
|
$userid = $phpgw_info['user']['account_id'];
|
||||||
}
|
}
|
||||||
|
|
||||||
addressbook_update_entry($ab_id,$userid,$fields,$fields['access'],$fields['cat_id']);
|
addressbook_update_entry($ab_id,$userid,$fields,$fields['access'],$fields['cat_id'],$tid);
|
||||||
$referer = urlencode($referer);
|
$referer = urlencode($referer);
|
||||||
Header("Location: "
|
Header("Location: "
|
||||||
. $phpgw->link('/addressbook/view.php',"ab_id=$ab_id&order=$order&sort=$sort&filter=$filter&start=$start&query=$query&cat_id=$cat_id&referer=$referer"));
|
. $phpgw->link('/addressbook/view.php',"ab_id=$ab_id&order=$order&sort=$sort&filter=$filter&start=$start&query=$query&cat_id=$cat_id&referer=$referer"));
|
||||||
|
@ -276,12 +276,12 @@
|
|||||||
return $ab_id;
|
return $ab_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
function addressbook_update_entry($id,$userid,$fields,$access,$cat_id)
|
function addressbook_update_entry($id,$userid,$fields,$access,$cat_id,$tid)
|
||||||
{
|
{
|
||||||
global $this,$rights;
|
global $this,$rights;
|
||||||
if ($rights & PHPGW_ACL_EDIT)
|
if ($rights & PHPGW_ACL_EDIT)
|
||||||
{
|
{
|
||||||
$this->update($id,$userid,$fields,$access,$cat_id);
|
$this->update($id,$userid,$fields,$access,$cat_id,$tid);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -3,6 +3,8 @@
|
|||||||
<input type="hidden" name="ab_id" value="{ab_id}">
|
<input type="hidden" name="ab_id" value="{ab_id}">
|
||||||
<input type="hidden" name="sort" value="{sort}">
|
<input type="hidden" name="sort" value="{sort}">
|
||||||
<input type="hidden" name="order" value="{order}">
|
<input type="hidden" name="order" value="{order}">
|
||||||
|
<input type="hidden" name="tid" value="{tid}">
|
||||||
|
<input type="hidden" name="cat_id" value="{cat_id}">
|
||||||
<input type="hidden" name="filter" value="{filter}">
|
<input type="hidden" name="filter" value="{filter}">
|
||||||
<input type="hidden" name="query" value="{query}">
|
<input type="hidden" name="query" value="{query}">
|
||||||
<input type="hidden" name="start" value="{start}">
|
<input type="hidden" name="start" value="{start}">
|
||||||
@ -16,6 +18,8 @@
|
|||||||
{cancel_link}
|
{cancel_link}
|
||||||
<input type="hidden" name="sort" value="{sort}">
|
<input type="hidden" name="sort" value="{sort}">
|
||||||
<input type="hidden" name="order" value="{order}">
|
<input type="hidden" name="order" value="{order}">
|
||||||
|
<input type="hidden" name="tid" value="{tid}">
|
||||||
|
<input type="hidden" name="cat_id" value="{cat_id}">
|
||||||
<input type="hidden" name="filter" value="{filter}">
|
<input type="hidden" name="filter" value="{filter}">
|
||||||
<input type="hidden" name="query" value="{query}">
|
<input type="hidden" name="query" value="{query}">
|
||||||
<input type="hidden" name="start" value="{start}">
|
<input type="hidden" name="start" value="{start}">
|
||||||
@ -26,6 +30,8 @@
|
|||||||
<input type="hidden" name="ab_id" value="{ab_id}">
|
<input type="hidden" name="ab_id" value="{ab_id}">
|
||||||
<input type="hidden" name="sort" value="{sort}">
|
<input type="hidden" name="sort" value="{sort}">
|
||||||
<input type="hidden" name="order" value="{order}">
|
<input type="hidden" name="order" value="{order}">
|
||||||
|
<input type="hidden" name="tid" value="{tid}">
|
||||||
|
<input type="hidden" name="cat_id" value="{cat_id}">
|
||||||
<input type="hidden" name="filter" value="{filter}">
|
<input type="hidden" name="filter" value="{filter}">
|
||||||
<input type="hidden" name="query" value="{query}">
|
<input type="hidden" name="query" value="{query}">
|
||||||
<input type="hidden" name="start" value="{start}">
|
<input type="hidden" name="start" value="{start}">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user