Jeroen Hoffman pushed to branch release/4.0 at cms-community / hippo-cms
Commits:
a7ee908e by Marijan Milicevic at 2016-07-19T11:09:51+02:00
CMS-10217 Regression (again): New-translated-folder under non-translated folder
won't store selected locale
- add language as argument if set
(cherry picked from commit b625f77be015b69d5c30d8f3cd6bde4f8b6b8d11)
- - - - -
e0632d82 by Jeroen Hoffman at 2016-07-19T11:10:07+02:00
CMS-10217 use StringUtils.isNotBlank instead of !Strings.isNullOrEmpty
(cherry picked from commit e6496a45c80ce7fff4a22f739f22554f1de5f520)
- - - - -
8eabde39 by Jeroen Hoffman at 2016-07-19T11:18:57+02:00
CMS-10217 Reintegrate bugfix branch into release/4.0
- - - - -
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
@@ -342,7 +342,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/3152b028a51c85f048b69ca43aea0fdd5c20c8b3...8eabde398adc78c799bdfd0fbbabacb43aad25c5
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
