Jeroen Hoffman pushed to branch release/3.2 at cms-community / hippo-cms
Commits:
b625f77b by Marijan Milicevic at 2016-06-16T18:26:30+02:00
CMS-10173 Regression (again): New-translated-folder under non-translated folder
won't store selected locale
- add language as argument if set
- - - - -
e6496a45 by Jeroen Hoffman at 2016-07-19T09:55:55+02:00
CMS-10173 use StringUtils.isNotBlank instead of !Strings.isNullOrEmpty
- - - - -
b9d734cf by Jeroen Hoffman at 2016-07-19T10:06:05+02:00
CMS-10173 Merge latest release/3.2 into bugfix branch
- - - - -
70c7ce28 by Jeroen Hoffman at 2016-07-19T10:10:00+02:00
CMS-10173 Reintegrate bugfix branch into release/3.2
- - - - -
1 changed file:
-
builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
Changes:
=====================================
builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
=====================================
---
a/builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
+++
b/builtin/src/main/java/org/hippoecm/frontend/plugins/standardworkflow/FolderWorkflowPlugin.java
@@ -349,7 +349,9 @@ public class FolderWorkflowPlugin extends RenderPlugin {
TreeMap<String, String> arguments = new
TreeMap<>();
arguments.put("name", nodeName);
arguments.put("localName", localName);
-
+ if
(StringUtils.isNotBlank(addDocumentModel.getLanguage())) {
+
arguments.put(HippoTranslationNodeType.LOCALE, addDocumentModel.getLanguage());
+ }
String path = workflow.add(category,
addDocumentModel.getPrototype(), arguments);
onWorkflowAdded(path);
JcrNodeModel nodeModel = new
JcrNodeModel(path);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/c146b56599c1815a64e7abfcbc6806bf17659b13...70c7ce281dc2e77fd7f726319085e3956abfa1cb
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
