extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-14 01:48:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix importing when accessory_of is missing

Browse Source
This commit is contained in:
Nathan Gray 2012-12-19 20:23:40 +00:00
parent 8ff5f6f99f
commit cb84d313e8
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/inc/class.resources_bo.inc.php
View File

@ -522,6 +522,7 @@ class resources_bo
$filter = array( $filter = array(
'cat_id' => array_flip((array)$this->acl->get_cats(EGW_ACL_READ)), 'cat_id' => array_flip((array)$this->acl->get_cats(EGW_ACL_READ)),
//'accessory_of' => '-1' //'accessory_of' => '-1'
'deleted' => null
); );
$limit = false; $limit = false;
if($options['start'] || $options['num_rows']) { if($options['start'] || $options['num_rows']) {

1
resources/inc/class.resources_import_csv.inc.php
View File

@ -70,6 +70,7 @@ class resources_import_csv extends importexport_basic_import_csv {
// Refresh ACL // Refresh ACL
//$GLOBALS['egw']->acl->read_repository(); //$GLOBALS['egw']->acl->read_repository();
} }
if(!$record->accessory_of) $record->accessory_of = -1;
//error_log(__METHOD__.__LINE__.array2string($_definition->plugin_options['conditions'])); //error_log(__METHOD__.__LINE__.array2string($_definition->plugin_options['conditions']));
if ($this->definition->plugin_options['conditions']) { if ($this->definition->plugin_options['conditions']) {