diff --git a/resources/inc/class.resources_bo.inc.php b/resources/inc/class.resources_bo.inc.php index bb363d0e5a..90a9a3c004 100755 --- a/resources/inc/class.resources_bo.inc.php +++ b/resources/inc/class.resources_bo.inc.php @@ -522,6 +522,7 @@ class resources_bo $filter = array( 'cat_id' => array_flip((array)$this->acl->get_cats(EGW_ACL_READ)), //'accessory_of' => '-1' + 'deleted' => null ); $limit = false; if($options['start'] || $options['num_rows']) { diff --git a/resources/inc/class.resources_import_csv.inc.php b/resources/inc/class.resources_import_csv.inc.php index 97a71d606e..2760b41a5d 100644 --- a/resources/inc/class.resources_import_csv.inc.php +++ b/resources/inc/class.resources_import_csv.inc.php @@ -70,6 +70,7 @@ class resources_import_csv extends importexport_basic_import_csv { // Refresh ACL //$GLOBALS['egw']->acl->read_repository(); } + if(!$record->accessory_of) $record->accessory_of = -1; //error_log(__METHOD__.__LINE__.array2string($_definition->plugin_options['conditions'])); if ($this->definition->plugin_options['conditions']) {