Merge branch 'master' into RAVE-1092
Conflicts:
rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
Project: http://git-wip-us.apache.org/repos/asf/rave/repo
Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/ae28a21d
Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/ae28a21d
Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/ae28a21d
Branch: refs/heads/master
Commit: ae28a21df8cf45db1ff3c1d174d0a4358b2d6cc9
Parents: 8a1a54b eaec643
Author: Stanton Sievers <[email protected]>
Authored: Tue Aug 12 10:19:29 2014 -0400
Committer: Stanton Sievers <[email protected]>
Committed: Tue Aug 12 10:19:29 2014 -0400
----------------------------------------------------------------------
.../apache/rave/portal/service/impl/DefaultPageService.java | 7 ++++++-
.../src/main/webapp/static/script/portal/rave_ui.js | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/rave/blob/ae28a21d/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
----------------------------------------------------------------------
diff --cc
rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
index 810074d,a6055a0..9d6dff5
---
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
@@@ -372,8 -367,17 +372,13 @@@ public class DefaultPageService impleme
// 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{
- return Boolean.FALSE;
- }
+ return pageRepository.save(clonedPage);
}
@Transactional
