From 5834374b856e90223b7596091a89b492247a7ff5 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Mon, 1 Jun 2015 10:08:26 +0000 Subject: [PATCH] RM-2203 (Show selected classification reason id's rather than description) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@105215 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/rma/classification/reasons.get.json.ftl | 3 ++- .../script/classification/ReasonsGetUnitTest.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/classification/reasons.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/classification/reasons.get.json.ftl index 5752e66166..f580ce38ae 100644 --- a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/classification/reasons.get.json.ftl +++ b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/classification/reasons.get.json.ftl @@ -6,7 +6,8 @@ <#list reasons as reason> { "id": "${reason.id?json_string}", - "displayLabel": "${reason.displayLabel?json_string}" + "displayLabel": "${reason.displayLabel?json_string}", + "fullReason": "${reason.id?json_string}: ${reason.displayLabel?json_string}" }<#if reason_has_next>, ] diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ReasonsGetUnitTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ReasonsGetUnitTest.java index 1dfc94d603..dc0983f8e9 100644 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ReasonsGetUnitTest.java +++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ReasonsGetUnitTest.java @@ -43,7 +43,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; /** * Tests for the get classification reasons API. - * + * * @author tpage */ public class ReasonsGetUnitTest extends BaseWebScriptUnitTest @@ -95,7 +95,7 @@ public class ReasonsGetUnitTest extends BaseWebScriptUnitTest // check the JSON result using Jackson to allow easy equality testing. ObjectMapper mapper = new ObjectMapper(); - String expectedJSONString = "{\"data\":{\"items\":[{\"displayLabel\":\"labelA\",\"id\":\"idA\"},{\"displayLabel\":\"labelB\",\"id\":\"idB\"}]}}"; + String expectedJSONString = "{\"data\":{\"items\":[{\"displayLabel\":\"labelA\",\"id\":\"idA\",\"fullReason\":\"idA: labelA\"},{\"displayLabel\":\"labelB\",\"id\":\"idB\",\"fullReason\":\"idB: labelB\"}]}}"; JsonNode expected = mapper.readTree(expectedJSONString); assertEquals(expected, mapper.readTree(actualJSONString)); }