From fbb1191bdc8c0b26e2c38773d988c90749e4e9c4 Mon Sep 17 00:00:00 2001
From: Dariusz Jarosz <djarosz@anl.gov>
Date: Tue, 29 Oct 2024 14:26:23 -0500
Subject: [PATCH] Allow multiple level of machine design catalog element
 representation. Closes #1688

---
 .../ItemDomainMachineDesignBaseController.java            | 6 ------
 .../ItemDomainMachineDesignBaseControllerUtility.java     | 8 --------
 2 files changed, 14 deletions(-)

diff --git a/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/controllers/ItemDomainMachineDesignBaseController.java b/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/controllers/ItemDomainMachineDesignBaseController.java
index 55de482cf..45c8a990a 100644
--- a/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/controllers/ItemDomainMachineDesignBaseController.java
+++ b/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/controllers/ItemDomainMachineDesignBaseController.java
@@ -3475,12 +3475,6 @@ public void prepareMachineAssignRepresentingAssemblyElement() {
         }
 
         if (parentMachineDesign != null) {
-            ItemElement representsCatalogElement = parentMachineDesign.getRepresentsCatalogElement();
-            if (representsCatalogElement != null) {
-                SessionUtility.addErrorMessage("Represented Parent", "Parent item is represented by another assembly part, cannot link another level of representation.");
-                return;
-            }
-            
             Item assignedItem = parentMachineDesign.getAssignedItem();
                         
             if (assignedItem != null && assignedItem.getItemElementDisplayList().size() != 0) {
diff --git a/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/controllers/utilities/ItemDomainMachineDesignBaseControllerUtility.java b/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/controllers/utilities/ItemDomainMachineDesignBaseControllerUtility.java
index e534eedcf..d08d321aa 100644
--- a/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/controllers/utilities/ItemDomainMachineDesignBaseControllerUtility.java
+++ b/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/controllers/utilities/ItemDomainMachineDesignBaseControllerUtility.java
@@ -729,14 +729,6 @@ private void updateRepresentingAssemblyElementForMachine(ItemDomainMachineDesign
                 throw new InvalidObjectState(errMessage);
             }
         }
-        
-        ItemDomainMachineDesign parentMachineDesign = node.getParentMachineDesign();
-        if (representedElement != null && parentMachineDesign.getRepresentsCatalogElement() != null) {
-            String errMessage = node.getName();
-            errMessage += " has a parent " + parentMachineDesign.getName();
-            errMessage += " with represented element reference.";
-            throw new InvalidObjectState(errMessage);
-        }
 
         List<ItemElement> elements = fetchElementsAvaiableForNodeRepresentation(node);