Woonsan Ko pushed to branch feature/spaplus at cms-community / 
hippo-site-toolkit


Commits:
5493c190 by Woonsan Ko at 2018-03-14T14:43:40-04:00
HSTTWO-4268: Adding definitionId metadata back

- - - - -


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
@@ -90,6 +90,11 @@ public class PageModelAggregationValve extends 
AggregationValve {
     private static final String PAGE_TITLE_METADATA = "pageTitle";
 
     /**
+     * Page definition ID (from the configuration) metadata name.
+     */
+    private static final String PAGE_DEFINITION_ID_METADATA = "definitionId";
+
+    /**
      * Jackson ObjectMapper instance for JSON (de)serialization.
      */
     private ObjectMapper objectMapper;
@@ -201,10 +206,17 @@ public class PageModelAggregationValve extends 
AggregationValve {
 
         final AggregatedPageModel pageModel = new AggregatedPageModel(id);
         final ComponentWindowModel pageWindowModel = new 
ComponentWindowModel(rootWindow);
+
+        final String definitionId = rootWindow.getComponentInfo().getId();
+        if (StringUtils.isNotEmpty(definitionId)) {
+            pageWindowModel.putMetadata(PAGE_DEFINITION_ID_METADATA, 
definitionId);
+        }
+
         final String pageTitle = 
requestContext.getResolvedSiteMapItem().getPageTitle();
         if (StringUtils.isNotEmpty(pageTitle)) {
             pageWindowModel.putMetadata(PAGE_TITLE_METADATA, pageTitle);
         }
+
         pageModel.setPage(pageWindowModel);
         addLinksToPageModel(pageModel);
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/5493c19050180fac3f9768d366c5447c9f55fdea

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/5493c19050180fac3f9768d366c5447c9f55fdea
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

Reply via email to