-
Improvement
-
Resolution: Won't Do
-
Minor
-
1.3
-
None
-
None
-
-
Yes
-
Empty show more show less
Patch
Index: magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/templates/SingletonParagraphTemplateModel.java =================================================================== --- magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/templates/SingletonParagraphTemplateModel.java (revision 31608) +++ magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/templates/SingletonParagraphTemplateModel.java (working copy) @@ -118,20 +118,22 @@ } private void createMainArea(STKTemplate templateDef) { - SingletonParagraphMainArea singletonDef = (SingletonParagraphMainArea)templateDef.getMainArea(); - try { - Content mainCollection = ContentUtil.getOrCreateContent(content, "main", ItemType.CONTENTNODE, true); - if (!mainCollection.hasContent(SINGLETON_NODE_NAME)) { - Content singletonNode = mainCollection.createContent(SINGLETON_NODE_NAME, ItemType.CONTENTNODE); - singletonNode.getMetaData().setTemplate(singletonDef.getAutoGeneratedParagraph().getName()); + if( templateDef.getMainArea() != null && templateDef.getMainArea() instanceof SingletonParagraphMainArea) { + SingletonParagraphMainArea singletonDef = (SingletonParagraphMainArea)templateDef.getMainArea(); + try { + Content mainCollection = ContentUtil.getOrCreateContent(content, "main", ItemType.CONTENTNODE, true); + if (!mainCollection.hasContent(SINGLETON_NODE_NAME)) { + Content singletonNode = mainCollection.createContent(SINGLETON_NODE_NAME, ItemType.CONTENTNODE); + singletonNode.getMetaData().setTemplate(singletonDef.getAutoGeneratedParagraph().getName()); - setDefaultValues(singletonNode, singletonDef.getAutoGeneratedParagraph().getDefaultValues()); + setDefaultValues(singletonNode, singletonDef.getAutoGeneratedParagraph().getDefaultValues()); - mainCollection.save(); - } - } catch (Exception e) { - throw new IllegalStateException("Can't create singleton paragraph", e); - } + mainCollection.save(); + } + } catch (Exception e) { + throw new IllegalStateException("Can't create singleton paragraph", e); + } + }//end if generate main area } protected void setDefaultValues(Content singletonNode, Map defaultValues)
Acceptance criteria
- depends upon
-
MGNLSTK-675 auto generation of paragraphs: introduce more generic mechanism
- Closed