Merge branch 'master' into RAVE-1273
Conflicts:
rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
Project: http://git-wip-us.apache.org/repos/asf/rave/repo
Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/096dcf19
Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/096dcf19
Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/096dcf19
Branch: refs/heads/master
Commit: 096dcf1960f2ec70f2b4a7aff293cb41c4035081
Parents: a79d859 acf2cf6
Author: Stanton Sievers <[email protected]>
Authored: Tue Aug 12 17:26:43 2014 -0400
Committer: Stanton Sievers <[email protected]>
Committed: Tue Aug 12 17:26:43 2014 -0400
----------------------------------------------------------------------
.../apache/rave/portal/model/impl/PageImpl.java | 6 ++-
.../apache/rave/portal/service/PageService.java | 4 +-
.../portal/service/impl/DefaultPageService.java | 18 ++++++---
.../portal/service/impl/DefaultUserService.java | 5 ++-
.../service/impl/DefaultPageServiceTest.java | 41 ++++++++++++++++++++
.../apache/rave/portal/web/api/rpc/PageApi.java | 6 +--
.../static/script/core/rave_opensocial.js | 6 +++
.../main/webapp/static/script/portal/rave_ui.js | 8 ++--
8 files changed, 76 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/rave/blob/096dcf19/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
----------------------------------------------------------------------
diff --cc
rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
index 1f47c72,3ae4fe6..b5fc108
---
a/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
+++
b/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
@@@ -297,10 -297,10 +297,10 @@@ public interface PageService
* @param pageId - the id of the page in question
* @param userId - the userid to add
* @param pageName = name of the page
- * @return true or false whether the user was added
+ * @return the newly cloned page
*/
- @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page',
'update')")
+ @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page',
'read')")
- Boolean clonePageForUser(String pageId, String userId, String pageName);
+ Page clonePageForUser(String pageId, String userId, String pageName);
/**
* Add another user to share this page with
