You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2014/07/03 18:46:11 UTC
[17/50] git commit: Updated page service with bug fixes for page
creation from template (RAVE-1066)
Updated page service with bug fixes for page creation from template (RAVE-1066)
git-svn-id: https://svn.apache.org/repos/asf/rave/trunk@1531277 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/rave/repo
Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/82777334
Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/82777334
Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/82777334
Branch: refs/heads/angular
Commit: 827773341c169c4b7b664338eb56653fd02d6197
Parents: e3f7f4c
Author: Matthew B. Franklin <mf...@apache.org>
Authored: Fri Oct 11 12:49:54 2013 +0000
Committer: Matthew B. Franklin <mf...@apache.org>
Committed: Fri Oct 11 12:49:54 2013 +0000
----------------------------------------------------------------------
.../org/apache/rave/portal/service/impl/DefaultPageService.java | 2 ++
.../src/main/java/org/apache/rave/portal/util/PageUtil.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/rave/blob/82777334/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 3585bb7..27c1ffc 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
@@ -144,6 +144,8 @@ public class DefaultPageService implements PageService {
throw new IllegalArgumentException("No page template found for the specified id " + pageTemplateId);
}
Page newInstance = PageUtil.convert(template, userService.getAuthenticatedUser(), false);
+ newInstance.setContextId(contextId);
+ newInstance.setName(pageName);
return pageRepository.save(newInstance);
}
http://git-wip-us.apache.org/repos/asf/rave/blob/82777334/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/PageUtil.java
----------------------------------------------------------------------
diff --git a/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/PageUtil.java b/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/PageUtil.java
index c88e387..73c0bbb 100644
--- a/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/PageUtil.java
+++ b/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/PageUtil.java
@@ -80,7 +80,7 @@ public class PageUtil {
*/
private static List<RegionWidget> convertWidgets(List<PageTemplateWidget> pageTemplateWidgets, Region region, boolean createIds){
List<RegionWidget> widgets = new ArrayList<RegionWidget>();
- int idx=100 * Integer.parseInt(region.getId());
+ int idx=createIds ? 100 * Integer.parseInt(region.getId()) : 0;
for (PageTemplateWidget ptw : pageTemplateWidgets){
RegionWidgetImpl regionWidget = new RegionWidgetImpl();
if(createIds) {