Author: mfranklin
Date: Fri Oct 11 12:49:54 2013
New Revision: 1531277
URL: http://svn.apache.org/r1531277
Log:
Updated page service with bug fixes for page creation from template (RAVE-1066)
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/PageUtil.java
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=1531277&r1=1531276&r2=1531277&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
Fri Oct 11 12:49:54 2013
@@ -144,6 +144,8 @@ public class DefaultPageService implemen
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);
}
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/PageUtil.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/PageUtil.java?rev=1531277&r1=1531276&r2=1531277&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/PageUtil.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/PageUtil.java
Fri Oct 11 12:49:54 2013
@@ -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) {
