r1504 - xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets

[Jeremi Joslin]

Author: jeremi
Date: 2006-11-03 14:59:12 +0100 (Fri, 03 Nov 2006)
New Revision: 1504

Modified:
   xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java
Log:
[GELC]
* fix the getCollection

Modified: xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java	2006-11-03 13:52:06 UTC (rev 1503)
+++ xwiki-apps/gelc/gelcv1/trunk/gelcplugins/src/main/java/org/gelc/xwiki/plugins/assets/AssetManagerPlugin.java	2006-11-03 13:59:12 UTC (rev 1504)
@@ -536,10 +536,10 @@
         if (colQ.published)
                hql +=  " and doc.web = '" + getCollectionSpace(colQ.collectionName, context) + "'";
         else
-               hql +=  " and doc.web='" + ASSET_TEMPORARY_SPACE;
+               hql +=  " and doc.web='" + ASSET_TEMPORARY_SPACE + "'";
+        if (colQ.author != null && colQ.author.length() > 0)
+             hql += " and doc.author = '" + colQ.author + "'";
         hql +=  " order by " + colQ.order;
-        if (colQ.author != null && colQ.author.length() > 0)
-             hql += "' and doc.author = '" + colQ.author + "'";
         List xDocs = context.getWiki().getStore().searchDocuments(hql, colQ.begining, colQ.end, context);
         return WrapDocuments(xDocs, context);
     }