Author: cgeer
Date: Mon Oct 29 06:26:33 2012
New Revision: 1403177
URL: http://svn.apache.org/viewvc?rev=1403177&view=rev
Log:
RAVE-837 Fix delete category problem. Issue is that the spring security checks
were checking against the entityid which is no longer present. Also fixes same
issue in RegionService, RegionWidgetService and WidgetService.
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/CategoryService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionWidgetService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/CategoryService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/CategoryService.java?rev=1403177&r1=1403176&r2=1403177&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/CategoryService.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/CategoryService.java
Mon Oct 29 06:26:33 2012
@@ -67,6 +67,6 @@ public interface CategoryService {
*
* @param category
*/
- @PreAuthorize("hasPermission(#category.entityId,
'org.apache.rave.portal.model.Category', 'delete')")
+ @PreAuthorize("hasPermission(#category.id,
'org.apache.rave.portal.model.Category', 'delete')")
void delete(Category category);
}
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionService.java?rev=1403177&r1=1403176&r2=1403177&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionService.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionService.java
Mon Oct 29 06:26:33 2012
@@ -27,6 +27,6 @@ public interface RegionService {
* Register a new region
* @param region the region object to register
*/
- @PreAuthorize("hasPermission(#region.entityId,
'org.apache.rave.portal.model.Region', 'create')")
+ @PreAuthorize("hasPermission(#region.id,
'org.apache.rave.portal.model.Region', 'create')")
void registerNewRegion(Region region);
}
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionWidgetService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionWidgetService.java?rev=1403177&r1=1403176&r2=1403177&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionWidgetService.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionWidgetService.java
Mon Oct 29 06:26:33 2012
@@ -42,7 +42,7 @@ public interface RegionWidgetService {
* @param regionWidget The RegionWidget to save.
* @return The updated RegionWidget with all ID numbers populated.
*/
- @PreAuthorize("hasPermission(#regionWidget.entityId,
'org.apache.rave.portal.model.RegionWidget', 'update')")
+ @PreAuthorize("hasPermission(#regionWidget.id,
'org.apache.rave.portal.model.RegionWidget', 'update')")
RegionWidget saveRegionWidget(RegionWidget regionWidget);
/**
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java?rev=1403177&r1=1403176&r2=1403177&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java
Mon Oct 29 06:26:33 2012
@@ -157,7 +157,7 @@ public interface WidgetService {
*
* @param widget to save
*/
- @PreAuthorize("hasPermission(#widget.entityId,
'org.apache.rave.portal.model.Widget', 'update')")
+ @PreAuthorize("hasPermission(#widget.id,
'org.apache.rave.portal.model.Widget', 'update')")
void updateWidget(Widget widget);
/**
