From fc2457f7e7ab09d04809d2262c616d9e3d696883 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu, 30 Mar 2023 17:18:43 +0200
Subject: [PATCH] FIX for server#166

---
 src/main/java/org/caosdb/server/jobs/core/Inheritance.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/org/caosdb/server/jobs/core/Inheritance.java b/src/main/java/org/caosdb/server/jobs/core/Inheritance.java
index 6ceb6295..a1bd800c 100644
--- a/src/main/java/org/caosdb/server/jobs/core/Inheritance.java
+++ b/src/main/java/org/caosdb/server/jobs/core/Inheritance.java
@@ -119,7 +119,7 @@ public class Inheritance extends EntityJob {
       }
 
       // implement properties
-      if (getEntity().hasProperties()) {
+      if (getEntity().getEntityStatus() == EntityStatus.QUALIFIED && getEntity().hasProperties()) {
         propertyLoop:
         for (final Property property : getEntity().getProperties()) {
           final ArrayList<Property> transfer = new ArrayList<>();
@@ -140,9 +140,6 @@ public class Inheritance extends EntityJob {
             if (getEntity().hasParents()) {
               outer:
               for (EntityInterface par : getEntity().getParents()) {
-                if (par.getEntityStatus() == EntityStatus.UNQUALIFIED) {
-                  continue;
-                }
                 if (!par.hasProperties()) {
                   par = resolve(par);
                 }
-- 
GitLab