mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-18 11:58:24 +01:00
Fix passing of cat_id
This commit is contained in:
parent
02cd5e8a7c
commit
5c431fd271
@ -90,7 +90,7 @@
|
|||||||
$this->cat_id = $data['cat_id'];
|
$this->cat_id = $data['cat_id'];
|
||||||
}
|
}
|
||||||
|
|
||||||
function import($tsvfile,$conv_type,$private)
|
function import($tsvfile,$conv_type,$private,$fcat_id)
|
||||||
{
|
{
|
||||||
global $phpgw;
|
global $phpgw;
|
||||||
|
|
||||||
@ -221,7 +221,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
fclose($fp);
|
fclose($fp);
|
||||||
$buffer = $contacts->import_end_file($buffer,$private,$cat_id);
|
$buffer = $contacts->import_end_file($buffer,$private,$fcat_id);
|
||||||
return $buffer;
|
return $buffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@
|
|||||||
$jselect = ' onChange="this.form.submit();"';
|
$jselect = ' onChange="this.form.submit();"';
|
||||||
}
|
}
|
||||||
/* Setup all and none first */
|
/* Setup all and none first */
|
||||||
$cats_link = "\n" .'<select name="cat_id'.($multiple?'[]':'').'"' .$jselect . ($multiple ? 'multiple size="3"' : '') . ">\n";
|
$cats_link = "\n" .'<select name="fcat_id'.($multiple?'[]':'').'"' .$jselect . ($multiple ? 'multiple size="3"' : '') . ">\n";
|
||||||
if (!$notall)
|
if (!$notall)
|
||||||
{
|
{
|
||||||
$cats_link .= '<option value=""';
|
$cats_link .= '<option value=""';
|
||||||
@ -75,11 +75,11 @@
|
|||||||
|
|
||||||
function import()
|
function import()
|
||||||
{
|
{
|
||||||
global $phpgw,$convert,$download,$tsvfile,$private,$conv_type;
|
global $phpgw,$convert,$download,$tsvfile,$private,$conv_type,$fcat_id;
|
||||||
|
|
||||||
if ($convert)
|
if ($convert)
|
||||||
{
|
{
|
||||||
$buffer = $this->bo->import($tsvfile,$conv_type,$private);
|
$buffer = $this->bo->import($tsvfile,$conv_type,$private,$fcat_id);
|
||||||
|
|
||||||
if ($download == '')
|
if ($download == '')
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user