Author: mfranklin
Date: Tue Sep 10 01:59:39 2013
New Revision: 1521345
URL: http://svn.apache.org/r1521345
Log:
Fixed service permission annotation (RAVE-1054)
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.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=1521345&r1=1521344&r2=1521345&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 01:59:39 2013
@@ -97,7 +97,7 @@ public interface PageService {
*
* @return A non-null, possibly empty list of page for the given user.
*/
- @PreAuthorize("hasPermission(new
org.apache.rave.portal.security.impl.RaveSecurityContext(#contextId,
'org.apache.rave.model.User'), 'org.apache.rave.model.Page', 'read')")
+ @PostAuthorize("returnObject == null or hasPermission(returnObject,
'read')")
List<Page> getPages(String context, String contextId);
/**
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java?rev=1521345&r1=1521344&r2=1521345&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
Tue Sep 10 01:59:39 2013
@@ -119,7 +119,6 @@ public class DefaultPageService implemen
return pageRepository.getPagesForContextType(contextId, context);
}
-
@Override
public Page getPageFromList(String pageId, List<Page> pages) {
for(Page page: pages) {
