[Aplaws-commit] r902 - trunk/ccm-core/src/com/arsdigita/persistence

[<ap...@vh...>]

Author: apevec
Date: 2005-09-22 07:57:11 +0200 (Thu, 22 Sep 2005)
New Revision: 902

Modified:
   trunk/ccm-core/src/com/arsdigita/persistence/DataQueryDataCollectionAdapter.java
Log:
SF patch [ 1160550 ] BugFix in DataQueryDomainCollectionAdapter


Modified: trunk/ccm-core/src/com/arsdigita/persistence/DataQueryDataCollectionAdapter.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/persistence/DataQueryDataCollectionAdapter.java	2005-09-22 05:39:04 UTC (rev 901)
+++ trunk/ccm-core/src/com/arsdigita/persistence/DataQueryDataCollectionAdapter.java	2005-09-22 05:57:11 UTC (rev 902)
@@ -19,6 +19,7 @@
 package com.arsdigita.persistence;
 
 import com.arsdigita.persistence.metadata.ObjectType;
+import com.redhat.persistence.metadata.Property;
 
 /**
  *  Adapter to make a data query look
@@ -97,6 +98,14 @@
     public DataQueryDataCollectionAdapter(String queryName,
                                           String dataObjectProperty) {
         super(queryName);
+        // SF patch [ 1160550 ] BugFix in DataQueryDomainCollectionAdapter
+        // populate object type prior to first call to next()
+        // essential if you need to filter DataCollection with PermissionService.filterObjects()
+        com.redhat.persistence.metadata.ObjectType type = SessionManager.getSession().getRoot().getObjectType(queryName);
+        Property prop = type.getProperty(dataObjectProperty);
+        String propertyType = prop.getType().getQualifiedName();
+        m_type = SessionManager.getMetadataRoot().getObjectType(propertyType);
+
         if (dataObjectProperty == null) { dataObjectProperty = ""; }
         m_dataObjectProperty = dataObjectProperty;