Author: psharples
Date: Tue Mar 5 03:58:03 2013
New Revision: 1452655
URL: http://svn.apache.org/r1452655
Log:
Fixes for page being deleted when share removed. See RAVE-896.
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_layout.js
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=1452655&r1=1452654&r2=1452655&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 Mar 5 03:58:03 2013
@@ -366,9 +366,8 @@ public class DefaultPageService implemen
@Transactional
public Boolean removeMemberFromPage(String pageId, String userId){
- User user = userService.getAuthenticatedUser();
Page page = this.getPage(pageId);
- if(page.getOwnerId().equals(user.getId())){
+ if(page.getOwnerId().equals(userId)){
// If I am the owner, this page has been cloned
// Declining a cloned page means there is no need to strip
// out this users pageUser object, instead remove the page itself
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_layout.js
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_layout.js?rev=1452655&r1=1452654&r2=1452655&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_layout.js
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_layout.js
Tue Mar 5 03:58:03 2013
@@ -263,7 +263,7 @@ rave.layout = rave.layout || (function()
if(userId == rave.layout.searchHandler.userId){
alert(rave.getClientMessage("revoke.share.current.user"));
// reload as page has been removed
- document.location.href='/';
+ document.location.href = rave.getContext() +
"/page/view";
}else{
alert("(" + username + ") " +
rave.getClientMessage("revoke.share"));
}
@@ -376,7 +376,7 @@ rave.layout = rave.layout || (function()
successCallback: function(result) {
rave.api.rpc.removeMemberFromPage({pageId:rave.layout.searchHandler.pageId,
userId:rave.layout.searchHandler.userId,
successCallback:function (result) {
- document.location.href='/';
+ document.location.href = rave.getContext() +
"/page/view";
}});
}
})
