Skip to content

Commit

Permalink
Merge pull request #100 from jmpascal/master
Browse files Browse the repository at this point in the history
Fix 1.3.2
  • Loading branch information
JM.PASCAL committed Sep 26, 2014
2 parents e5fc9a7 + 4047167 commit 40c09c6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1119,29 +1119,29 @@ else if (!isProcess && processIdentifier == null)
switch ((Integer) filter.getFilterValue(FILTER_KEY_DUE))
{
case FILTER_DUE_TODAY:
addPredicate(sb, PublicAPIConstant.DUEAT_VALUE, DateUtils.format(calendar), "<");
addPredicate(sb, PublicAPIConstant.DUEAT_VALUE, DateUtils.formatISO(calendar), "<");

calendar.add(Calendar.DAY_OF_MONTH, -1);
addPredicate(sb, PublicAPIConstant.DUEAT_VALUE, DateUtils.format(calendar), ">");
addPredicate(sb, PublicAPIConstant.DUEAT_VALUE, DateUtils.formatISO(calendar), ">");
break;
case FILTER_DUE_TOMORROW:
addPredicate(sb, PublicAPIConstant.DUEAT_VALUE, DateUtils.format(calendar), ">");
addPredicate(sb, PublicAPIConstant.DUEAT_VALUE, DateUtils.formatISO(calendar), ">");

calendar.add(Calendar.DAY_OF_MONTH, 1);
addPredicate(sb, PublicAPIConstant.DUEAT_VALUE, DateUtils.format(calendar), "<");
addPredicate(sb, PublicAPIConstant.DUEAT_VALUE, DateUtils.formatISO(calendar), "<");
break;
case FILTER_DUE_7DAYS:
addPredicate(sb, PublicAPIConstant.DUEAT_VALUE, DateUtils.format(calendar), ">");
addPredicate(sb, PublicAPIConstant.DUEAT_VALUE, DateUtils.formatISO(calendar), ">");

calendar.add(Calendar.DAY_OF_MONTH, 7);
addPredicate(sb, PublicAPIConstant.DUEAT_VALUE, DateUtils.format(calendar), "<");
addPredicate(sb, PublicAPIConstant.DUEAT_VALUE, DateUtils.formatISO(calendar), "<");
break;
case FILTER_DUE_OVERDUE:
calendar.add(Calendar.DAY_OF_MONTH, -1);
addPredicate(sb, PublicAPIConstant.DUEAT_VALUE, DateUtils.format(calendar), "<");
addPredicate(sb, PublicAPIConstant.DUEAT_VALUE, DateUtils.formatISO(calendar), "<");
break;
case FILTER_DUE_NODATE:
addPredicate(sb, PublicAPIConstant.DUEAT_VALUE, DateUtils.format(calendar), "LIKE");
addPredicate(sb, PublicAPIConstant.DUEAT_VALUE, DateUtils.formatISO(calendar), "LIKE");
break;
default:
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public void testCreateSessionAndRepositoryInformation()
}

// Edition Informations : Community by default
Assert.assertEquals(OnPremiseConstant.ALFRESCO_EDITION_COMMUNITY, alfsession.getRepositoryInfo().getEdition());
Assert.assertEquals(OnPremiseConstant.ALFRESCO_EDITION_UNKNOWN, alfsession.getRepositoryInfo().getEdition());

// Edition Version number
Assert.assertNotNull(alfsession.getRepositoryInfo().getVersion());
Expand Down

0 comments on commit 40c09c6

Please sign in to comment.