[Aplaws-commit] r1015 - trunk/ccm-ldn-search/src/com/arsdigita/london/search/ui

[<ssk...@vh...>]

Author: sskracic
Date: 2005-11-30 12:18:57 +0100 (Wed, 30 Nov 2005)
New Revision: 1015

Modified:
   trunk/ccm-ldn-search/src/com/arsdigita/london/search/ui/AdvancedQueryComponent.java
   trunk/ccm-ldn-search/src/com/arsdigita/london/search/ui/SimpleQueryComponent.java
Log:
  Integrated sourceforge patch [ 1368140 ] Search all items - not just cms.


Modified: trunk/ccm-ldn-search/src/com/arsdigita/london/search/ui/AdvancedQueryComponent.java
===================================================================
--- trunk/ccm-ldn-search/src/com/arsdigita/london/search/ui/AdvancedQueryComponent.java	2005-11-30 11:10:55 UTC (rev 1014)
+++ trunk/ccm-ldn-search/src/com/arsdigita/london/search/ui/AdvancedQueryComponent.java	2005-11-30 11:18:57 UTC (rev 1015)
@@ -25,6 +25,7 @@
 import com.arsdigita.bebop.FormData;
 import com.arsdigita.bebop.parameters.ParameterData;
 
+import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
 import com.arsdigita.search.ui.BaseQueryComponent;
 import com.arsdigita.search.ui.filters.PermissionFilterComponent;
 import com.arsdigita.search.ui.filters.SimpleCategoryFilterWidget;
@@ -61,7 +62,7 @@
         // XXX READ instead of CMS_READ_ITEM
         if (Search.getConfig().isIntermediaEnabled()) {
             add(new PermissionFilterComponent(
-                    SecurityManager.CMS_READ_ITEM));
+                    PrivilegeDescriptor.READ));
             
             Application app = Web.getContext().getApplication();
             Category root = Category.getRootForObject(app);

Modified: trunk/ccm-ldn-search/src/com/arsdigita/london/search/ui/SimpleQueryComponent.java
===================================================================
--- trunk/ccm-ldn-search/src/com/arsdigita/london/search/ui/SimpleQueryComponent.java	2005-11-30 11:10:55 UTC (rev 1014)
+++ trunk/ccm-ldn-search/src/com/arsdigita/london/search/ui/SimpleQueryComponent.java	2005-11-30 11:18:57 UTC (rev 1015)
@@ -24,8 +24,8 @@
 import com.arsdigita.bebop.FormModel;
 import com.arsdigita.bebop.FormData;
 import com.arsdigita.bebop.parameters.ParameterData;
+import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
 import com.arsdigita.london.search.SearchConfig;
-import com.arsdigita.cms.SecurityManager;
 import com.arsdigita.cms.ui.search.VersionFilterComponent;
 import com.arsdigita.search.Search;
 import com.arsdigita.search.ui.BaseQueryComponent;
@@ -55,7 +55,7 @@
         
         // XXX READ instead of CMS_READ_ITEM
         if (Search.getConfig().isIntermediaEnabled()) {
-            add(new PermissionFilterComponent(SecurityManager.CMS_READ_ITEM));
+            add(new PermissionFilterComponent(PrivilegeDescriptor.READ));
         }
         
         if (Search.getConfig().isIntermediaEnabled() ||