Woonsan Ko pushed to branch feature/spaplus at cms-community /
hippo-site-toolkit
Commits:
85538529 by Woonsan Ko at 2018-02-22T14:22:32-05:00
HSTTWO-4227: contribute content model (document) even if it is not from a
container component.
- - - - -
1 changed file:
-
components/core/src/main/java/org/hippoecm/hst/core/pagemodel/container/PageModelAggregationValve.java
Changes:
=====================================
components/core/src/main/java/org/hippoecm/hst/core/pagemodel/container/PageModelAggregationValve.java
=====================================
---
a/components/core/src/main/java/org/hippoecm/hst/core/pagemodel/container/PageModelAggregationValve.java
+++
b/components/core/src/main/java/org/hippoecm/hst/core/pagemodel/container/PageModelAggregationValve.java
@@ -396,6 +396,7 @@ public class PageModelAggregationValve extends
AggregationValve {
for (int i = 1; i < sortedComponentWindowsLen; i++) {
final HstComponentWindow window = sortedComponentWindows[i];
+ ComponentWindowModel componentWindowModel = null;
final HstRequest hstRequest = requestMap.get(window);
final HstResponse hstResponse = responseMap.get(window);
@@ -412,36 +413,36 @@ public class PageModelAggregationValve extends
AggregationValve {
continue;
}
- final ComponentWindowModel componentWindowModel = new
ComponentWindowModel(
+ componentWindowModel = new ComponentWindowModel(
window.getReferenceNamespace(), window.getName(),
window.getComponentName());
componentWindowModel.setLabel(window.getComponentInfo().getLabel());
addParameterMapMetadata(window, componentWindowModel);
decorateComponentWindowMetadata(hstRequest, hstResponse,
componentWindowModel);
-
- for (Map.Entry<String, Object> entry :
hstRequest.getModelsMap().entrySet()) {
- final String name = entry.getKey();
- final Object model = entry.getValue();
- ReferenceMetadataBaseModel referenceModel = null;
-
- if (model instanceof HippoBean) {
- final HippoBean bean = (HippoBean) model;
- final String contentId = getContentId(bean);
- final String jsonPointerContentId =
contentIdToJsonName(contentId);
- HippoBeanWrapperModel beanWrapperModel =
addContentModelToPageModel(pageModel, bean, contentId,
- jsonPointerContentId);
- decorateContentMetadata(hstRequest, hstResponse, bean,
beanWrapperModel);
- referenceModel = new ReferenceMetadataBaseModel(
- CONTENT_JSON_POINTER_PREFIX +
jsonPointerContentId);
- }
-
- componentWindowModel.putModel(name, (referenceModel !=
null) ? referenceModel : model);
- }
-
curContainerWindowModel.addComponentWindowSet(componentWindowModel);
} else {
curContainerWindowModel = null;
}
+ for (Map.Entry<String, Object> entry :
hstRequest.getModelsMap().entrySet()) {
+ final String name = entry.getKey();
+ final Object model = entry.getValue();
+ ReferenceMetadataBaseModel referenceModel = null;
+
+ if (model instanceof HippoBean) {
+ final HippoBean bean = (HippoBean) model;
+ final String contentId = getContentId(bean);
+ final String jsonPointerContentId =
contentIdToJsonName(contentId);
+ HippoBeanWrapperModel beanWrapperModel =
addContentModelToPageModel(pageModel, bean, contentId,
+ jsonPointerContentId);
+ decorateContentMetadata(hstRequest, hstResponse, bean,
beanWrapperModel);
+ referenceModel = new ReferenceMetadataBaseModel(
+ CONTENT_JSON_POINTER_PREFIX +
jsonPointerContentId);
+ }
+
+ if (componentWindowModel != null) {
+ componentWindowModel.putModel(name, (referenceModel !=
null) ? referenceModel : model);
+ }
+ }
}
return pageModel;
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/8553852979606dc5d5f4047e4f229574a2059ab8
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/8553852979606dc5d5f4047e4f229574a2059ab8
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
