#28785 include in 23.10.24 LTS

dotCMS · Jun 17, 2024 · e1d2b27 · e1d2b27
1 parent fbd36e0
commit e1d2b27
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/dotCMS/hotfix_tracking.md b/dotCMS/hotfix_tracking.md
@@ -111,4 +111,5 @@ This maintenance release includes the following code fixes:
 104. https://github.com/dotCMS/core/issues/28306 : Can't Import Page Assets using the export file #28306
 105. https://github.com/dotCMS/core/issues/28352 : Send Email sub-action doesn't set the current user to $dotcontent viewtool #28352
 106. https://github.com/dotCMS/core/issues/28689 : Update LTS Telemetry plugin #28689
-107. https://github.com/dotCMS/private-issues/issues/34
+107. https://github.com/dotCMS/private-issues/issues/34
+108. https://github.com/dotCMS/core/issues/28785 : APIs return incorrect information for pages with fields using the variable name "description" #28785
diff --git a/dotCMS/src/curl-test/GraphQLTests.json b/dotCMS/src/curl-test/GraphQLTests.json
@@ -703,7 +703,6 @@
 									"    pm.expect(page[\"canLock\"], 'FAILED:[canLock]').equal(true);",
 									"    pm.expect(page[\"canRead\"], 'FAILED:[canRead]').equal(true);",
 									"    pm.expect(page[\"deleted\"], 'FAILED:[deleted]').equal(false);",
-									"    pm.expect(page[\"description\"]).equal(\"Costa Rica Rain Forest\");",
 									"    pm.expect(page[\"extension\"]).equal(\"page\");",
 									"    pm.expect(page[\"folder\"]).equal(\"6c8a2ac4-36a7-4b01-b9c0-c2c1d91ddfdb\");",
 									"    pm.expect(page[\"friendlyName\"]).equal(\"Costa Rica Rain Forest\");",
@@ -833,7 +832,6 @@
 									"    pm.expect(page[\"canLock\"], 'FAILED:[canLock]').equal(true);",
 									"    pm.expect(page[\"canRead\"], 'FAILED:[canRead]').equal(true);",
 									"    pm.expect(page[\"deleted\"], 'FAILED:[deleted]').equal(false);",
-									"    pm.expect(page[\"description\"]).equal(\"Costa Rica Rain Forest\");",
 									"    pm.expect(page[\"extension\"]).equal(\"page\");",
 									"    pm.expect(page[\"folder\"].folderId).equal(\"6c8a2ac4-36a7-4b01-b9c0-c2c1d91ddfdb\");",
 									"    pm.expect(page[\"folder\"].folderName).equal(\"destinations\");",

diff --git a/dotCMS/src/curl-test/PagesResourceTests.json b/dotCMS/src/curl-test/PagesResourceTests.json
@@ -429,7 +429,6 @@
 									"    pm.expect(page[\"canLock\"], 'FAILED:[canLock]').equal(true);",
 									"    pm.expect(page[\"canRead\"], 'FAILED:[canRead]').equal(true);",
 									"    pm.expect(page[\"deleted\"], 'FAILED:[deleted]').equal(false);",
-									"    pm.expect(page[\"description\"]).equal(\"Costa Rica Rain Forest\");",
 									"    pm.expect(page[\"extension\"]).equal(\"page\");",
 									"    pm.expect(page[\"folder\"]).equal(\"6c8a2ac4-36a7-4b01-b9c0-c2c1d91ddfdb\");",
 									"    pm.expect(page[\"friendlyName\"]).equal(\"Costa Rica Rain Forest\");",
@@ -943,7 +942,6 @@
 									"    pm.expect(page[\"canLock\"], 'FAILED:[canLock]').equal(true);",
 									"    pm.expect(page[\"canRead\"], 'FAILED:[canRead]').equal(true);",
 									"    pm.expect(page[\"deleted\"], 'FAILED:[deleted]').equal(false);",
-									"    pm.expect(page[\"description\"]).equal(\"Costa Rica Rain Forest\");",
 									"    pm.expect(page[\"extension\"]).equal(\"page\");",
 									"    pm.expect(page[\"folder\"]).equal(\"6c8a2ac4-36a7-4b01-b9c0-c2c1d91ddfdb\");",
 									"    pm.expect(page[\"friendlyName\"]).equal(\"Costa Rica Rain Forest\");",

diff --git a/...c/main/java/com/dotmarketing/portlets/contentlet/transform/strategy/PageViewStrategy.java b/...c/main/java/com/dotmarketing/portlets/contentlet/transform/strategy/PageViewStrategy.java
@@ -78,7 +78,7 @@ protected Map<String, Object> transform(final HTMLPageAsset page, final Map<Stri
 
         map.put(MIMETYPE_FIELD, "application/dotpage");
         map.put("name", page.getPageUrl());
-        map.put("description", page.getFriendlyName());
+        map.put("friendlyName", page.getFriendlyName());
         map.put("extension", "page");
         map.put("isContentlet", true);
         map.put("statusIcons", UtilHTML.getStatusIcons(page));