Always hide the "query related" button when the relationship is owned.

wocommunity · Jan 6, 2016 · 7410579 · 7410579
1 parent 106fe10
commit 7410579
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/.../Components/Nonlocalized.lproj/ERMODEditRelationshipPage.wo/ERMODEditRelationshipPage.wod b/.../Components/Nonlocalized.lproj/ERMODEditRelationshipPage.wo/ERMODEditRelationshipPage.wod
@@ -219,5 +219,5 @@ ListNotEmpty: WOConditional {
 }
 
 ShowFind: WOConditional {
-	condition = d2wContext.shouldShowQueryRelatedButton;
+	condition = shouldShowQueryRelatedButton;
 }
diff --git a/Frameworks/D2W/ERModernLook/Sources/er/modern/look/pages/ERMODEditRelationshipPage.java b/Frameworks/D2W/ERModernLook/Sources/er/modern/look/pages/ERMODEditRelationshipPage.java
@@ -80,6 +80,7 @@ public interface Keys extends ERD2WEditRelationshipPage.Keys {
 		public static String displayPropertyKeys = "displayPropertyKeys";
 		public static String subTask = "subTask";
 		public static String isEntityCreatable = "isEntityCreatable";
+        public static String shouldShowQueryRelatedButton = "shouldShowQueryRelatedButton";
 
 	}
 
@@ -349,17 +350,17 @@ public void setMasterObjectAndRelationshipKey(EOEnterpriseObject eo, String rela
      * @see er.directtoweb.pages.ERD2WPage#settings()
      */
     @Override
-    public NSDictionary settings() {
+    public NSDictionary<String,Object> settings() {
         String pc = d2wContext().dynamicPage();
         if (pc != null) {
             if (d2wContext().valueForKey("currentRelationship") != null) {
                 // set parentRelationship key to allow subcomponents to
                 // reference the correct ID (wonder-140)
-                return new NSDictionary(new Object[] { pc,
-                        d2wContext().valueForKey("currentRelationship") }, new Object[] {
+                return new NSDictionary<String,Object>(new Object[] { pc,
+                        d2wContext().valueForKey("currentRelationship") }, new String[] {
                         "parentPageConfiguration", "parentRelationship" });
             } else {
-                return new NSDictionary(pc, "parentPageConfiguration");
+                return new NSDictionary<String,Object>(pc, "parentPageConfiguration");
             }
         }
         return null;
@@ -539,6 +540,24 @@ public boolean isEntityCreatable() {
 		return ERXValueUtilities.booleanValue(d2wContext().valueForKey(Keys.isEntityCreatable)) && !isEntityReadOnly();
 	}
 
+    public boolean shouldShowQueryRelatedButton() {
+        boolean shouldShowQueryRelatedButton = ERXValueUtilities
+                .booleanValue(d2wContext().valueForKey(Keys.shouldShowQueryRelatedButton));
+        if (isRelationshipOwned()) {
+            // if the relationship is owned, search makes no sense
+            shouldShowQueryRelatedButton = false;
+        }
+        return shouldShowQueryRelatedButton;
+    }
+
+    public boolean isRelationshipOwned() {
+        boolean isRelationshipOwned = false;
+        if (masterObject().allPropertyKeys().contains(relationshipKey())) {
+            isRelationshipOwned = masterObject().classDescription().ownsDestinationObjectsForRelationshipKey(relationshipKey());
+        }
+        return isRelationshipOwned;
+    }
+
 	private void writeObject(ObjectOutputStream out) throws IOException {
 		out.writeObject(_masterObject);
 		out.writeObject(_objectToAddToRelationship);