Bert Leunis pushed to branch release/3.2 at cms-community /
hippo-plugin-dashboard-document-wizard
Commits:
65ca5dbc by Jasper Floor at 2017-10-12T11:35:03+02:00
HIPPLUG-1499 creation of folders corrected
- - - - -
c07f5733 by Bert Leunis at 2017-10-12T14:06:29+02:00
HIPPLUG-1499 update plugin and demo version numbers; return null from method
- - - - -
351d8f64 by Bert Leunis at 2017-10-12T14:14:52+02:00
HIPPLUG-1499 update more demo poms
- - - - -
034a28d4 by Bert Leunis at 2017-10-12T14:16:34+02:00
HIPPLUG-1499 Reintegrate feature/HIPPLUG-1499
- - - - -
8 changed files:
- demo/bootstrap/configuration/pom.xml
- demo/bootstrap/content/pom.xml
- demo/bootstrap/pom.xml
- demo/cms/pom.xml
- demo/pom.xml
- demo/site/pom.xml
- pom.xml
-
src/main/java/org/onehippo/forge/dashboard/documentwizard/NewDocumentWizardPlugin.java
Changes:
=====================================
demo/bootstrap/configuration/pom.xml
=====================================
--- a/demo/bootstrap/configuration/pom.xml
+++ b/demo/bootstrap/configuration/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onehippo.cms7.dashboard-document-wizard-demo</groupId>
<artifactId>hippo-plugin-dashboard-document-wizard-demo-bootstrap</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.2-SNAPSHOT</version>
</parent>
<name>Hippo Plugin Dashboard Document Wizard Demo Bootstrap
Configuration</name>
=====================================
demo/bootstrap/content/pom.xml
=====================================
--- a/demo/bootstrap/content/pom.xml
+++ b/demo/bootstrap/content/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onehippo.cms7.dashboard-document-wizard-demo</groupId>
<artifactId>hippo-plugin-dashboard-document-wizard-demo-bootstrap</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.2-SNAPSHOT</version>
</parent>
<name>Hippo Plugin Dashboard Document Wizard Demo Bootstrap Content</name>
=====================================
demo/bootstrap/pom.xml
=====================================
--- a/demo/bootstrap/pom.xml
+++ b/demo/bootstrap/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onehippo.cms7.dashboard-document-wizard-demo</groupId>
<artifactId>hippo-plugin-dashboard-document-wizard-demo</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.2-SNAPSHOT</version>
</parent>
<name>Hippo Plugin Dashboard Document Wizard Demo Bootstrap</name>
=====================================
demo/cms/pom.xml
=====================================
--- a/demo/cms/pom.xml
+++ b/demo/cms/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onehippo.cms7.dashboard-document-wizard-demo</groupId>
<artifactId>hippo-plugin-dashboard-document-wizard-demo</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.2-SNAPSHOT</version>
</parent>
<name>Hippo Plugin Dashboard Document Wizard Demo CMS</name>
=====================================
demo/pom.xml
=====================================
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -20,19 +20,17 @@
<parent>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms7-release</artifactId>
- <version>11.2.3-SNAPSHOT</version>
+ <version>11.2.4-SNAPSHOT</version>
</parent>
<name>Hippo Plugin Dashboard Document Wizard Demo</name>
<description>Hippo Plugin Dashboard Document Wizard Demo</description>
<groupId>org.onehippo.cms7.dashboard-document-wizard-demo</groupId>
<artifactId>hippo-plugin-dashboard-document-wizard-demo</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.2-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
-
<hippo.plugin.dashboard-document-wizard.version>3.2.1-SNAPSHOT</hippo.plugin.dashboard-document-wizard.version>
-
<essentials.version>3.0.0-SNAPSHOT</essentials.version>
<jsp-api.version>2.2</jsp-api.version>
<taglibs.version>1.2.1</taglibs.version>
=====================================
demo/site/pom.xml
=====================================
--- a/demo/site/pom.xml
+++ b/demo/site/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onehippo.cms7.dashboard-document-wizard-demo</groupId>
<artifactId>hippo-plugin-dashboard-document-wizard-demo</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.2-SNAPSHOT</version>
</parent>
<name>Hippo Plugin Dashboard Document Wizard Demo Site</name>
=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2010-2016 Hippo B.V. (http://www.onehippo.com)
+ Copyright 2010-2017 Hippo B.V. (http://www.onehippo.com)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onehippo.cms7</groupId>
<artifactId>hippo-cms7-project</artifactId>
- <version>28</version>
+ <version>28.7</version>
</parent>
<artifactId>hippo-plugin-dashboard-document-wizard</artifactId>
@@ -49,9 +49,9 @@
</issueManagement>
<properties>
- <hippo.repository.version>4.2.0</hippo.repository.version>
- <hippo.cms.version>4.2.0</hippo.cms.version>
- <hippo.plugin.selections.version>4.2.0</hippo.plugin.selections.version>
+ <hippo.repository.version>4.2.2</hippo.repository.version>
+ <hippo.cms.version>4.2.5</hippo.cms.version>
+ <hippo.plugin.selections.version>4.2.1</hippo.plugin.selections.version>
<testng.version>6.0.1</testng.version>
</properties>
=====================================
src/main/java/org/onehippo/forge/dashboard/documentwizard/NewDocumentWizardPlugin.java
=====================================
---
a/src/main/java/org/onehippo/forge/dashboard/documentwizard/NewDocumentWizardPlugin.java
+++
b/src/main/java/org/onehippo/forge/dashboard/documentwizard/NewDocumentWizardPlugin.java
@@ -460,6 +460,7 @@ public class NewDocumentWizardPlugin extends
RenderPlugin<Object> implements IHe
final String folderPath = getFolderPath();
if (folderPath == null) {
log.error("Could not create path to target folder.");
+ return null;
}
return getOrCreateFolder(folderPath);
}
@@ -482,6 +483,7 @@ public class NewDocumentWizardPlugin extends
RenderPlugin<Object> implements IHe
// add any folder nodes that do not yet exist
HippoNode folderHippoNode = (HippoNode) folderNode;
+ Collections.reverse(notExistingFolders);
for (String newFolder : notExistingFolders) {
folderHippoNode = createFolder(folderHippoNode, newFolder);
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-dashboard-document-wizard/compare/25655bea6c25e3c70e2e3a1478fc6588d8ce9c1f...034a28d4a4e20cd9c10ebfca6b130624a6bfaf75
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-dashboard-document-wizard/compare/25655bea6c25e3c70e2e3a1478fc6588d8ce9c1f...034a28d4a4e20cd9c10ebfca6b130624a6bfaf75
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
