Commit Graph

3212 Commits

Author SHA1 Message Date
roxana
72a7501d5e When the last step of the current disposition is completed, no more calculation is needed.
(cherry picked from commit 606e91545c0725b5523770b1c3cb1cffd38c0ce0)
2016-10-24 14:39:27 +01:00
roxana
9c5d0283cf Checking if disposition as of date was changed manually.
(cherry picked from commit fd6fcd8e1442102a446971f691e78780cd576674)
2016-10-24 14:39:22 +01:00
Tom Page
5468461288 RM-2526 Fix location of MultipleSchedulesTest. 2016-10-24 14:07:39 +01:00
roxana
cb3357080d I've tweaked the tests a bit to handle daylight savings. 2016-10-24 15:30:37 +03:00
roxana
4abeb19938 Added null check 2016-10-24 11:09:32 +03:00
roxana
9e7ae77cd5 When the last step of the current disposition is completed, no more calculation is needed. 2016-10-24 10:16:58 +03:00
Tom Page
9ad8e59d3c Merge RM-2526_IntegrationTests into merge-2.4/RM-2526_BlendedDispositionSchedule. 2016-10-21 16:36:06 +01:00
Tom Page
2348a1f5a5 Merge feature-2.3/RM-2526_IntegrationTests into release/V2.3. 2016-10-21 13:43:31 +01:00
Tom Page
9d6c9fdcc8 Merge feature-2.3/RM-4127_UITestsFor2.3 into release/V2.3. 2016-10-21 13:16:51 +01:00
Oana Nechiforescu
82789f31d8 Updates to amps names. 2016-10-21 13:29:24 +03:00
Oana Nechiforescu
d5759d6abc Updates to pom 2016-10-21 13:11:27 +03:00
Tom Page
0b52d1bd73 RM-3386 Merge commit '48a65f5' into merge-2.4/RM-2526_BlendedDispositionSchedules. 2016-10-21 11:03:36 +01:00
Tom Page
bb4a3f4298 Merge release/V2.4 into merge-2.4/RM-2526_BlendedDispositionSchedule. 2016-10-21 10:59:17 +01:00
roxana
7d82844048 Checking if disposition as of date was changed manually. 2016-10-21 11:13:51 +03:00
Oana Nechiforescu
0884997f81 Trying to fix the poms. Have no idea if that will work. 2016-10-21 11:03:18 +03:00
Mihai Cozma
f4f7033b05 Merge remote-tracking branch 'origin/release/V2.4' into release/V2.5 2016-10-21 09:38:50 +03:00
Tom Page
699e29bb28 Merge feature-2.3/RM-3386_ManuallySetDate into release/V2.3. 2016-10-20 15:20:00 +01:00
Tom Page
79e6296e1d RM-2526 Fix typo. 2016-10-20 14:06:52 +01:00
Tom Page
3ceb976ec8 RM-2526 Make sure we set up the file plan from within a transaction. 2016-10-20 12:35:32 +01:00
Tom Page
a7bd537d82 RM-2526 Add a second test for linking to a shorter schedule. 2016-10-20 11:36:47 +01:00
Tom Page
03e39287f8 RM-2526 Integration test for linking record to longer schedule. 2016-10-20 11:14:16 +01:00
Tom Page
f464e21a54 RM-4127 Backport UI tests to V2.3. 2016-10-19 13:29:05 +01:00
Tom Page
48a65f5067 Merge release/V2.3 into RM-3386_ManauallySetDate. 2016-10-19 08:31:13 +01:00
Mihai Cozma
480718fe24 Fix version with more digits. modified: pom.xml 2016-10-19 08:58:32 +03:00
David Webster
5077b83ddc Merge branch 'release/V2.2' into merge-2.3/HF-2.2.0.2-merge 2016-10-18 16:40:14 +01:00
David Webster
063479a0c0 Merge remote-tracking branch 'origin/release/V2.2.0.x' into release/V2.2 2016-10-18 16:36:10 +01:00
David Webster
b04584ba58 Set up 2.2.0.x HF branch ready for next release 2016-10-18 16:23:46 +01:00
Mihai Cozma
871f2c995c Merge commit '2745b7' into release/V2.4 2016-10-18 17:39:09 +03:00
Tom Page
970d1080e2 RM-2526 Fix license headers. 2016-10-18 11:29:10 +01:00
Tom Page
c7b4f284ff Merge RM-2526 Blended disposition schedule into release/V2.4. 2016-10-18 10:54:43 +01:00
Tom Page
3ad77f6f00 Merge feature-2.3/RM2526_BlendedDispositionSchedule into release/V2.3. 2016-10-18 10:36:47 +01:00
roxana
d82c27e6a4 Fixed unit test for linking. 2016-10-18 11:49:15 +03:00
roxana
1dea4c9d2d Modified validation for link conditions to compare the original disposition of the record with the target one. 2016-10-18 10:57:08 +03:00
David Webster
028cce27bc MNT-16852: HF 2.2.0.2 release, remove snapshot version number 2016-10-17 22:01:17 +01:00
Tom Page
891ea35956 RM-2526 Fix copy/paste error. 2016-10-17 16:47:43 +01:00
roxana
c827e843ed Added check for adding disposition lifecycle aspect. 2016-10-17 17:50:12 +03:00
Tom Page
531f10c458 RM-2526 Treat null as the largest date possible.
If a disposition step has an "as of" date of null then it requires human
interaction. Consequently there is no length of time we can wait before the
step triggers - so we treat it as the latest step if there are multiple
disposition schedules.
2016-10-17 15:27:43 +01:00
Mihai Cozma
b5141957f7 Merge branch 'feature-2.3/RM-4250_fileplan_creation_freeze' into release/V2.3 2016-10-17 16:02:21 +03:00
Mihai Cozma
d9251cb866 Fix resource filtering 2016-10-17 13:45:25 +03:00
roxana
3ea86fa148 Fixed tests (for disposition schedules with event based actions). 2016-10-17 11:01:22 +03:00
Tom Page
c8577fe90c RM-3386 Persist the fact that an "as of" date has been manually set.
If a "disposition as of" date is manually set using "Edit Retention Date"
then don't update it when changing the disposition schedule steps. Use a
new property to store the fact that the "disposition as of" date has been
manually set.
2016-10-14 16:15:16 +01:00
Tom Page
8d9a47e3ac RM-4247 Recalculate the "disposition as of" date if the period property changes. 2016-10-14 14:28:04 +01:00
Mihai Cozma
0100e01a0b Merge branch 'feature-2.3/RM-4245_update_module_version' into release/V2.3 2016-10-14 11:38:51 +03:00
Mihai Cozma
5937ac38cb add symetrical build-helper-maven-plugin for both rm-share and rm-server 2016-10-14 11:18:28 +03:00
Mihai Cozma
cabaa629af Fixed to handle more digits 2016-10-13 17:08:59 +03:00
Mihai Cozma
747ac95e20 RM-4245_update_module_version 2016-10-13 15:37:54 +03:00
David Webster
03118d9e0e MNT-16852: Fix typo in XML 2016-10-13 11:36:47 +01:00
David Webster
14b3e8e212 MNT-16852: Optimise list conversion as per code review comment 2016-10-13 11:06:11 +01:00
David Webster
eca62dfc83 MNT-16852: Add comment explaining reason behind extracting mapping to properties file 2016-10-12 15:31:12 +01:00
David Webster
60c2cb693b MNT-16852: Remove unnecessary imports 2016-10-12 15:25:06 +01:00