RAVE-1090 | Cloning a page for the current user prompts them to accept/decline 
the page


Project: http://git-wip-us.apache.org/repos/asf/rave/repo
Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/21d1152b
Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/21d1152b
Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/21d1152b

Branch: refs/heads/master
Commit: 21d1152b47cb3d0a9e30a0f32dbe4094955a080c
Parents: aab1719
Author: Stanton Sievers <[email protected]>
Authored: Mon Aug 11 11:09:06 2014 -0400
Committer: Stanton Sievers <[email protected]>
Committed: Mon Aug 11 11:09:06 2014 -0400

----------------------------------------------------------------------
 .../apache/rave/portal/service/impl/DefaultPageService.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/rave/blob/21d1152b/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
----------------------------------------------------------------------
diff --git 
a/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
 
b/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
index 9ee4f60..a6055a0 100644
--- 
a/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
+++ 
b/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
@@ -367,7 +367,12 @@ public class DefaultPageService implements PageService {
         // newly created page - so only one pageUser
         PageUser pageUser = clonedPage.getMembers().get(0);
         // update status to pending
-        pageUser.setPageStatus(PageInvitationStatus.PENDING);
+        User currentUser = userService.getAuthenticatedUser();
+        if (currentUser.getId().equals(user.getId())) {
+            pageUser.setPageStatus(PageInvitationStatus.OWNER);
+        } else {
+            pageUser.setPageStatus(PageInvitationStatus.PENDING);
+        }
         if(pageRepository.save(clonedPage) != null){
             return Boolean.TRUE;
         }else{

Reply via email to