Commit Graph

1065 Commits

Author SHA1 Message Date
Rodica Sutu
c087c888c6 add an end to end test to check the search disposition schedule properties 2019-09-04 16:07:38 +03:00
Rodica Sutu
15e6b5c107 Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-6931_RetentionWIthRetainStepWithFrozenRecords_v2 2019-09-04 14:20:49 +03:00
cagache
9a3f52cc5b Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge/MNT-20740_BinDuplicationHotFix 2019-09-03 17:10:21 +03:00
cagache
c1b3decae4 Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/MNT-20740_BinDuplicationHotFix 2019-09-03 13:36:48 +03:00
Rodica Sutu
44c35a454e remove unwanted logs 2019-09-03 11:36:00 +03:00
cagache
995a771b51 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/MNT-20740_BinDuplicationHotFix
# Conflicts:
#	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/ContentBinDuplicationUtilityUnitTest.java
#	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/ContentDestructionComponentUnitTest.java
2019-09-03 10:10:18 +03:00
Rodica Sutu
f4f18f1047 disable on properties update for a frozen aspect 2019-09-03 09:01:15 +03:00
cagache
fa48983bb6 apply code style 2019-09-02 13:33:37 +03:00
Roy Wetherall
a48cb2755c Deal with review comments 2019-08-30 11:28:44 +10:00
Roy Wetherall
8e26f5aad5 Addition tests for records, fixed up a couple of issues in the query method as a result. 2019-08-29 21:35:00 +10:00
Roy Wetherall
1c539f9f05 Fix issue with inaccurate results returning from content URL query
* added integration test for MNT scenarios
* checked for nodeId's that don't exist in query results
* changed DAO method to return set of node references rather tha nodeId strings
* turned off logging by default
2019-08-29 12:28:04 +10:00
Roy Wetherall
211ebba2f2 Add logging to rm query DAO implementation 2019-08-29 09:50:57 +10:00
Rodica Sutu
ba9a192950 disable on update properties for frozen items when setting the record search properties 2019-08-27 09:34:30 +03:00
Sara Aspery
d79caf2466 Merge branch 'feature-2.7/MNT-20740_BinDuplicationHotFix' into hotfix-2.7/MNT-20740_BinDuplicationHotFix
# Conflicts:
#	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/ContentBinDuplicationUtility.java
2019-08-22 12:29:45 +01:00
Sara Aspery
18bd7d7fac MNT-20740 New db query 2019-08-22 11:19:34 +01:00
Claudia Agache
a03fce52d3 Merge branch 'feature/RM-6911_AddActiveContentToHoldRestAPI' into 'master'
RM-6911 Add/Remove Active Content To/From Holds via REST API

See merge request records-management/records-management!1218
2019-08-22 06:36:39 +01:00
cagache
27496b81f1 code review comments 2019-08-21 18:19:18 +03:00
Ross Gale
1575124fd7 Merge branch 'feature/RM-6873_RemoveActiveContentFromHold' into 'master'
RM-6873 adding code to allow for the removal of active content from a hold

See merge request records-management/records-management!1216
2019-08-21 08:44:56 +01:00
cagache
5230a9e0e8 RM-6926 Don't trigger onUpdateProperties policy when a frozen node is added to another hold 2019-08-20 14:56:46 +03:00
cagache
d990f30e8c Merge changes from feature/RM-6873_RemoveActiveContentFromHold 2019-08-20 08:09:32 +03:00
Ross Gale
3d4175078d Merge branch 'feature/RM-6904_PreventUpdateHeldActiveContent' into feature/RM-6873_RemoveActiveContentFromHold 2019-08-19 15:47:32 +01:00
cagache
a5d245b5f6 Throw PermissionDeniedException instead of AccessDeniedException and internationalized the messages. 2019-08-19 15:02:40 +03:00
cagache
3dfc01f716 Added check for Remove From Hold capability 2019-08-19 09:32:33 +03:00
cagache
f858d6d203 Added fix to not trigger onUpdateProperties policy when deleting a hold. 2019-08-16 19:08:54 +03:00
cagache
cc968e5aa8 small fix 2019-08-16 17:28:53 +03:00
cagache
54420ca212 RM-6906 Add integration tests for prevent update of held content. Added fix to not trigger onUpdateProperties policy when removing the frozen aspect. 2019-08-16 16:10:09 +03:00
cagache
b9a4df14f5 code review comments 2019-08-16 10:56:08 +03:00
cagache
221a633c2a Merge changes from feature/RM-6873_RemoveActiveContentFromHold 2019-08-16 09:44:56 +03:00
Ross Gale
a5722c31c4 RM-6873 adding in edit protection changes 2019-08-15 13:25:18 +01:00
rlucanu
4f03687e83 RM-6904 code review changes 2019-08-14 17:54:37 +03:00
cagache
f972c54efb Moved instanceOf method from ServiceBaseImpl class to a utility class 2019-08-14 17:04:04 +03:00
Ross Gale
2af340c5d6 RM-6873 sonar update 2019-08-14 13:40:39 +01:00
cagache
947b293c76 Merge remote-tracking branch 'remotes/origin/feature/RM-6873_RemoveActiveContentFromHold' into feature/RM-6911_AddActiveContentToHoldRestAPI 2019-08-14 15:22:27 +03:00
Ross Gale
dff5b452d9 RM-6873 code review changes 2019-08-14 11:20:18 +01:00
rlucanu
94936bc8a7 RM-6904 Fixing tests 2019-08-14 12:12:54 +03:00
cagache
c3021ccfa1 Do not allow addition of locked content to holds 2019-08-13 17:10:06 +03:00
rlucanu
ae64374c61 RM-6904 Tiding up 2019-08-13 01:24:22 +03:00
cagache
8fc0ca7e5a Merge remote-tracking branch 'remotes/origin/feature/RM-6873_RemoveActiveContentFromHold' into feature/RM-6911_AddActiveContentToHoldRestAPI 2019-08-09 12:53:03 +03:00
cagache
2f88cee847 Add active content to hold through rest api 2019-08-09 12:07:24 +03:00
Ross Gale
d5278c4ec7 RM-6873 adding code to allow for the removal of active content from a hold 2019-08-09 10:06:30 +01:00
rlucanu
93084fac63 RM-6904 Prevent updating held active content 2019-08-08 13:15:22 +03:00
cagache
5dae326ea0 fix sonar issues 2019-08-07 12:38:18 +03:00
cagache
1876c120d7 fix sonar issues 2019-08-06 16:25:08 +03:00
cagache
66706abac5 code review comments 2019-08-06 13:45:53 +03:00
cagache
53f75085a5 Added check for archived nodes 2019-08-05 16:40:26 +03:00
cagache
2fd1f661e2 code review comments 2019-08-02 17:31:02 +03:00
cagache
30d05f4f7a Merge remote-tracking branch 'remotes/origin/master' into feature/RM-6872_AddActiveContentToHold 2019-08-02 15:37:21 +03:00
cagache
862e69da17 get default file plan only if node is not a file plan component 2019-08-02 09:42:09 +03:00
cagache
5348b963c3 code review comments 2019-08-01 16:02:55 +03:00
Sara Aspery
7c4d8e91ab MNT-20740 BinDuplicationHotFixSqlRefactor 2019-07-30 16:35:48 +01:00