You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@rave.apache.org by mf...@apache.org on 2013/09/10 18:01:56 UTC

svn commit: r1521535 - /rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java

Author: mfranklin
Date: Tue Sep 10 16:01:56 2013
New Revision: 1521535

URL: http://svn.apache.org/r1521535
Log:
Changing to filter permission annotation (RAVE-1054)

Modified:
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java

Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java?rev=1521535&r1=1521534&r2=1521535&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java Tue Sep 10 16:01:56 2013
@@ -24,6 +24,7 @@ import org.apache.rave.model.Region;
 import org.apache.rave.model.RegionWidget;
 import org.apache.rave.rest.model.SearchResult;
 import org.springframework.security.access.prepost.PostAuthorize;
+import org.springframework.security.access.prepost.PostFilter;
 import org.springframework.security.access.prepost.PreAuthorize;
 
 import java.util.List;
@@ -97,7 +98,7 @@ public interface PageService {
      *
      * @return A non-null, possibly empty list of page for the given user.
      */
-    @PostAuthorize("returnObject == null or hasPermission(returnObject, 'read')")
+    @PostFilter("hasPermission(filterObject, 'read')")
     List<Page> getPages(String context, String contextId);
 
     /**