Don't display "remove related" button on owned relationships.

wocommunity · Jan 6, 2016 · 28cb3c8 · 28cb3c8
1 parent 04f0b92
commit 28cb3c8
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/...DirectToWeb/Sources/er/modern/directtoweb/components/buttons/ERMDRemoveRelatedButton.java b/...DirectToWeb/Sources/er/modern/directtoweb/components/buttons/ERMDRemoveRelatedButton.java
@@ -36,7 +36,9 @@
  */
 public class ERMDRemoveRelatedButton extends ERMDDeleteButton {
 
-	@SuppressWarnings("unused")
+    private static final long serialVersionUID = 1L;
+
+    @SuppressWarnings("unused")
 	private static final Logger log = Logger.getLogger(ERMDRemoveRelatedButton.class);
 
 	public interface Keys extends ERMDActionButton.Keys {
@@ -176,10 +178,11 @@ public String removeButtonClass() {
 	}
 
     /**
-     * Boolean used to hide/show the confirmation dialog's remove button. 
+     * Boolean used to hide/show the confirmation dialog's remove button.
      * 
-     * The remove button show only be displayed if the reverse relationship for the related eo is not
-     * mandatory and isEntityRemoveable returns true.
+     * The remove button should only be displayed if the relationship is not
+     * owned, the reverse relationship for the related EO not mandatory and
+     * isEntityRemoveable returns true.
      */
     public Boolean showRemoveButton() {
     	if (_showRemoveButton == null) {
@@ -191,12 +194,14 @@ public Boolean showRemoveButton() {
     			EOEntity masterEntity = ERXEOAccessUtilities.entityForEo(masterObj);
     			EORelationship relationship = masterEntity.relationshipNamed(dds.detailKey());
     			EORelationship reverseRelationship = relationship.inverseRelationship();
-    			if(isRemoveable) {
-    				if(reverseRelationship == null) {
-    					_showRemoveButton = Boolean.TRUE;
-    				} else {
-    					_showRemoveButton = !reverseRelationship.isMandatory();
-    				}
+    			if(isRemoveable && !relationship.ownsDestination()) {
+                    if (!relationship.ownsDestination()) {
+                        if (reverseRelationship == null) {
+                            _showRemoveButton = Boolean.TRUE;
+                        } else {
+                            _showRemoveButton = !reverseRelationship.isMandatory();
+                        }
+                    }
     			} else {
     				_showRemoveButton = Boolean.FALSE;
     			}