[Wonder-cvs] SF.net SVN: wonder:[11957] branches/Wonder_2_0_0_Branch/Wonder/Frameworks/ EOF/ERRest/Sources/er/rest/ERXRestRequestNode.java

[<ms...@us...>]

Revision: 11957
          http://wonder.svn.sourceforge.net/wonder/?rev=11957&view=rev
Author:   mschrag
Date:     2011-02-18 16:34:34 +0000 (Fri, 18 Feb 2011)

Log Message:
-----------
it should pull sort orderins from child filter, not keyFilter

Modified Paths:
--------------
    branches/Wonder_2_0_0_Branch/Wonder/Frameworks/EOF/ERRest/Sources/er/rest/ERXRestRequestNode.java

Modified: branches/Wonder_2_0_0_Branch/Wonder/Frameworks/EOF/ERRest/Sources/er/rest/ERXRestRequestNode.java
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Frameworks/EOF/ERRest/Sources/er/rest/ERXRestRequestNode.java	2011-02-18 04:41:08 UTC (rev 11956)
+++ branches/Wonder_2_0_0_Branch/Wonder/Frameworks/EOF/ERRest/Sources/er/rest/ERXRestRequestNode.java	2011-02-18 16:34:34 UTC (rev 11957)
@@ -748,7 +748,8 @@
 		toManyRelationshipNode.setType(destinationEntity.entityName());
 
 		List childrenObjects = (List) key.valueInObject(obj);
-		NSArray sortOrderings = keyFilter.sortOrderings();
+		ERXKeyFilter childFilter = keyFilter._filterForKey(key);
+		NSArray sortOrderings = childFilter.sortOrderings();
 		if (sortOrderings != null && sortOrderings.count() > 0) {
 			if (childrenObjects instanceof NSArray) {
 				// MS: this cast is stupid, but 5.2 NSArray doesn't impl List, so the compiler screams
@@ -758,7 +759,6 @@
 				log.warn("Skipping sort orderings for '" + key + "' on " + obj + " because sort orderings are only supported for NSArrays.");
 			}
 		}
-		ERXKeyFilter childFilter = keyFilter._filterForKey(key);
 		for (Object childObj : childrenObjects) {
 			ERXRestRequestNode childNode = new ERXRestRequestNode(null, false);
 			childNode._fillInWithObjectAndFilter(childObj, destinationEntity, childFilter, delegate, visitedObjects);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.