Ate Douma pushed to branch feature/translations-psp1 at cms / hippo-plugin-dashboard-document-wizard
Commits: 65c399c5 by Unico Hommes at 2015-11-24T12:31:24+00:00 HIPPLUG-1200 rollback changes from release preparation of dashboard-document-wizard-2.x-translations-1 - - - - - c39705ad by Arent-Jan Banck at 2016-01-08T14:30:19+00:00 CMS-9856: Update copyright year to 2016 - - - - - de57f959 by Arthur Bogaart at 2016-01-25T15:14:37+00:00 HIPPLUG-1256: Bump version of parent POM to 27.4 and remove duplicate <groupId/> element - - - - - 372e8807 by Arent-Jan Banck at 2016-01-26T13:04:43+00:00 CMS-9899: prepare branch hippo-plugin-dashboard-document-wizard-2.2.x - - - - - 0c9d2142 by Arent-Jan Banck at 2016-01-26T13:04:48+00:00 CMS-9899: prepare for next development iteration - - - - - d5900514 by Arent-Jan Banck at 2016-01-26T13:41:14+00:00 CMS-9899: prepare branch dashboard-document-wizard-demo-2.2.x - - - - - 1afb90ae by Arent-Jan Banck at 2016-01-26T13:41:19+00:00 CMS-9899: prepare for next development iteration - - - - - 9957a3f6 by Ate Douma at 2016-01-27T13:36:01+00:00 CMS-9905: Update and align project pom parent and other dependency version references across all product projects - - - - - d821f076 by Arent-Jan Banck at 2016-01-30T12:06:41+00:00 HIPPLUG-1260: Correct property name to be in sync with release pom naming - - - - - 20dbbf77 by Ate Douma at 2016-02-16T01:31:54+01:00 HIPPLUG-1200 merge changes from master - - - - - 3 changed files: - NOTICE - pom.xml - src/main/java/org/onehippo/forge/dashboard/documentwizard/NewDocumentWizardPlugin.java Changes: ===================================== NOTICE ===================================== --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Hippo Plugin Dashboard Document Wizard -Copyright 2010-2015 Hippo B.V. (http://www.onehippo.com) +Copyright 2010-2016 Hippo B.V. (http://www.onehippo.com) This product includes software developed by: Hippo B.V., Amsterdam, The Netherlands (http://www.onehippo.com/); ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2010-2015 Hippo B.V. (http://www.onehippo.com) + Copyright 2010-2016 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,11 +20,11 @@ <parent> <groupId>org.onehippo.cms7</groupId> <artifactId>hippo-cms7-project</artifactId> - <version>27.2</version> + <version>28-SNAPSHOT</version> </parent> <artifactId>hippo-plugin-dashboard-document-wizard</artifactId> - <version>2.x-translations-1.0-SNAPSHOT</version> + <version>3.0.0-translations-psp1-SNAPSHOT</version> <packaging>jar</packaging> <inceptionYear>2010</inceptionYear> @@ -38,9 +38,9 @@ </description> <scm> - <connection>scm:svn:https://svn.onehippo.org/repos/hippo/hippo-cms7/plugins/dashboard-document-wizard/branches/dashboard-document-wizard-2.x-translations-1</connection> - <developerConnection>scm:svn:https://svn.onehippo.org/repos/hippo/hippo-cms7/plugins/dashboard-document-wizard/branches/dashboard-document-wizard-2.x-translations-1</developerConnection> - <url>https://svn.onehippo.org/repos/hippo/hippo-cms7/plugins/dashboard-document-wizard/branches/dashboard-document-wizard-2.x-translations-1</url> + <connection>scm:svn:https://svn.onehippo.org/repos/hippo/hippo-cms7/plugins/dashboard-document-wizard/trunk/</connection> + <developerConnection>scm:svn:https://svn.onehippo.org/repos/hippo/hippo-cms7/plugins/dashboard-document-wizard/trunk/</developerConnection> + <url>https://svn.onehippo.org/repos/hippo/hippo-cms7/plugins/dashboard-document-wizard/trunk/</url> </scm> <issueManagement> @@ -49,9 +49,9 @@ </issueManagement> <properties> - <hippo.repository.version>3.2.0-SNAPSHOT</hippo.repository.version> - <hippo.cms.version>3.x-translations-1.0-SNAPSHOT</hippo.cms.version> - <hippo.plugins.selections.version>3.2.0-SNAPSHOT</hippo.plugins.selections.version> + <hippo.repository.version>4.0.0-translations-psp1-SNAPSHOT</hippo.repository.version> + <hippo.cms.version>4.0.0-translations-psp1-SNAPSHOT</hippo.cms.version> + <hippo.plugin.selections.version>4.0.0-translations-psp1-SNAPSHOT</hippo.plugin.selections.version> <testng.version>6.0.1</testng.version> @@ -71,7 +71,7 @@ </releases> </repository> </repositories> - + <dependencies> <dependency> <groupId>org.onehippo.cms7</groupId> @@ -97,14 +97,14 @@ <dependency> <groupId>org.onehippo.cms7</groupId> <artifactId>hippo-plugin-selections-addon-repository</artifactId> - <version>${hippo.plugins.selections.version}</version> + <version>${hippo.plugin.selections.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.onehippo.cms7</groupId> <artifactId>hippo-plugin-selections-addon-cms</artifactId> - <version>${hippo.plugins.selections.version}</version> + <version>${hippo.plugin.selections.version}</version> <scope>provided</scope> </dependency> ===================================== 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 @@ -432,9 +432,10 @@ public class NewDocumentWizardPlugin extends RenderPlugin<Object> implements IHe // add the not-encoded document name as translation if (!documentName.equals(encodedDocumentName)) { + DefaultWorkflow defaultWorkflow = (DefaultWorkflow)workflowMgr.getWorkflow("core", nodeModel.getNode()); if (defaultWorkflow != null) { - defaultWorkflow.localizeName(documentName); + defaultWorkflow.setDisplayName(documentName); } } } View it on GitLab: https://code.onehippo.org/cms/hippo-plugin-dashboard-document-wizard/compare/4231387467aaa87f60911cd85988fc6f83d50c2c...20dbbf7700d5187a945262f97bff8c535d51fe00
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
