inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-1070, added rule property substitution for day of month

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@73716 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Hibbins
2014-06-13 09:44:26 +00:00
parent 356122740d
commit e0528c803e
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rm-server/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java
View File

@@ -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
{

3
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/SubstitutionSuggestionsRestApiTest.java
View File

@@ -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",
});
}
}

4
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionPropertySubs.java
View File

@@ -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);

12
rm-server/unit-test/java/org/alfresco/repo/action/parameter/DateParameterProcessorUnitTest.java
View File

@@ -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());
}
}