Jeroen Hoffman pushed to branch release/2.26 at cms-community / hippo-cms
Commits:
8a43d25b by Marijan Milicevic at 2016-07-19T12:58:20+02:00
CMS-10218 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)
- - - - -
f906f0be by Jeroen Hoffman at 2016-07-19T12:58:36+02:00
CMS-10218 use StringUtils.isNotBlank instead of !Strings.isNullOrEmpty
(cherry picked from commit e6496a45c80ce7fff4a22f739f22554f1de5f520)
- - - - -
2ae1aa7c by Jeroen Hoffman at 2016-07-19T13:33:51+02:00
CMS-10218 Import HippoTranslationNodeType after cherry picking didn't build
- - - - -
7f3fac84 by Jeroen Hoffman at 2016-07-19T13:45:50+02:00
CMS-10218 Reintegrate bugfix branch into release/2.26
- - - - -
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
@@ -75,6 +75,7 @@ import org.hippoecm.repository.api.WorkflowManager;
import org.hippoecm.repository.standardworkflow.DefaultWorkflow;
import org.hippoecm.repository.standardworkflow.EditableWorkflow;
import org.hippoecm.repository.standardworkflow.FolderWorkflow;
+import org.hippoecm.repository.translation.HippoTranslationNodeType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -307,7 +308,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);
UserSession.get().getJcrSession().refresh(true);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/153abb8a0b21e5aec633a8d5fe31c131f5aad8cc...7f3fac84352900a8f17ba4f7de575540b0d4ac12
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
