diff --git a/rm-server/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java b/rm-server/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java index 3d97704cd0..e8c61e95e0 100644 --- a/rm-server/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java +++ b/rm-server/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java @@ -50,6 +50,7 @@ public class DateParameterProcessor extends ParameterProcessor implements Parame DAY, DAY + SEP + LONG, DAY + SEP + NUMBER, + DAY + SEP + MONTH, DAY + SEP + YEAR, MONTH + SEP + SHORT, MONTH, @@ -116,11 +117,15 @@ public class DateParameterProcessor extends ParameterProcessor implements Parame } else if (NUMBER.equalsIgnoreCase(style)) { - pattern = "u"; + pattern = "uu"; + } + else if (MONTH.equalsIgnoreCase(style)) + { + pattern = "dd"; } else if (YEAR.equalsIgnoreCase(style)) { - pattern = "D"; + pattern = "DDD"; } else { diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/SubstitutionSuggestionsRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/SubstitutionSuggestionsRestApiTest.java index b90763f442..b83713bed9 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/SubstitutionSuggestionsRestApiTest.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/SubstitutionSuggestionsRestApiTest.java @@ -87,7 +87,8 @@ public class SubstitutionSuggestionsRestApiTest extends BaseRMWebScriptTestCase "date.month.number", "date.month.long", "date.month.short", - "date.month" + "date.month", + "date.day.month", }); } } \ No newline at end of file diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionPropertySubs.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionPropertySubs.java index 98722a34b7..b806d33eaa 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionPropertySubs.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionPropertySubs.java @@ -63,8 +63,8 @@ public class TestActionPropertySubs extends RMActionExecuterAbstractBase Date date = new Date(); String dayShort = new SimpleDateFormat("EE").format(date); String dayLong = new SimpleDateFormat("EEEE").format(date); - String dayNumber = new SimpleDateFormat("u").format(date); - String dayYear = new SimpleDateFormat("D").format(date); + String dayNumber = new SimpleDateFormat("uu").format(date); + String dayYear = new SimpleDateFormat("DDD").format(date); String monthShort = new SimpleDateFormat("MMM").format(date); String monthLong = new SimpleDateFormat("MMMM").format(date); String monthNumber = new SimpleDateFormat("MM").format(date); diff --git a/rm-server/unit-test/java/org/alfresco/repo/action/parameter/DateParameterProcessorUnitTest.java b/rm-server/unit-test/java/org/alfresco/repo/action/parameter/DateParameterProcessorUnitTest.java index d806e81f6a..9f3703ab48 100644 --- a/rm-server/unit-test/java/org/alfresco/repo/action/parameter/DateParameterProcessorUnitTest.java +++ b/rm-server/unit-test/java/org/alfresco/repo/action/parameter/DateParameterProcessorUnitTest.java @@ -50,12 +50,12 @@ public class DateParameterProcessorUnitTest assertTrue(suggestions.contains("date.day")); assertTrue(suggestions.contains("date.day.long")); assertTrue(suggestions.contains("date.day.number")); + assertTrue(suggestions.contains("date.day.month")); assertTrue(suggestions.contains("date.day.year")); assertTrue(suggestions.contains("date.month.short")); assertTrue(suggestions.contains("date.month")); assertTrue(suggestions.contains("date.month.long")); assertTrue(suggestions.contains("date.month.number")); - assertTrue(suggestions.contains("date.year.short")); assertEquals(10, suggestions.size()); } @@ -67,12 +67,12 @@ public class DateParameterProcessorUnitTest assertTrue(suggestions.contains("date.day")); assertTrue(suggestions.contains("date.day.long")); assertTrue(suggestions.contains("date.day.number")); + assertTrue(suggestions.contains("date.day.month")); assertTrue(suggestions.contains("date.day.year")); assertTrue(suggestions.contains("date.month.short")); assertTrue(suggestions.contains("date.month")); assertTrue(suggestions.contains("date.month.long")); assertTrue(suggestions.contains("date.month.number")); - assertTrue(suggestions.contains("date.year.short")); assertEquals(10, suggestions.size()); } @@ -84,12 +84,12 @@ public class DateParameterProcessorUnitTest assertTrue(suggestions.contains("date.day")); assertTrue(suggestions.contains("date.day.long")); assertTrue(suggestions.contains("date.day.number")); + assertTrue(suggestions.contains("date.day.month")); assertTrue(suggestions.contains("date.day.year")); assertTrue(suggestions.contains("date.month.short")); assertTrue(suggestions.contains("date.month")); assertTrue(suggestions.contains("date.month.long")); assertTrue(suggestions.contains("date.month.number")); - assertTrue(suggestions.contains("date.year.short")); assertEquals(10, suggestions.size()); } @@ -101,8 +101,9 @@ public class DateParameterProcessorUnitTest assertTrue(suggestions.contains("date.day")); assertTrue(suggestions.contains("date.day.long")); assertTrue(suggestions.contains("date.day.number")); + assertTrue(suggestions.contains("date.day.month")); assertTrue(suggestions.contains("date.day.year")); - assertEquals(5, suggestions.size()); + assertEquals(6, suggestions.size()); } @Test @@ -115,6 +116,7 @@ public class DateParameterProcessorUnitTest assertTrue(suggestions.contains("date.month.long")); assertTrue(suggestions.contains("date.month.number")); assertTrue(suggestions.contains("date.year.long")); - assertEquals(6, suggestions.size()); + assertTrue(suggestions.contains("date.day.month")); + assertEquals(7, suggestions.size()); } }