Commit Graph

276 Commits

Author SHA1 Message Date
Tuna Aksoy
0614914beb Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25
Conflicts:
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
2016-10-05 15:20:19 +01:00
Tuna Aksoy
2db9730702 Merge branch 'feature-2.3/RM-4162_MergeToV2.3' into release/V2.3
# Conflicts:
#	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java
2016-10-04 22:56:45 +01:00
Roxana Lucanu-Ghetu
80c64b59eb Merge branch 'feature-2.4/RM-3060' into 'release/V2.4'
Feature 2.4/rm 3060 - Record linked to folder with the same disposition schedule couldn't be cut off

Added search by name for current disposition action; when the record has multiple disposition schedules the current disposition action may not be found by id.

See merge request !157

(cherry picked from commit d9883a3b02)
2016-10-03 12:10:20 +03:00
Tuna Aksoy
2832594788 RM-4095 (Fix failing tests after merging 2.3.0.x up to master) 2016-10-01 22:50:50 +01:00
Tom Page
eacfd00e0c Let git handle line endings for us. 2016-09-23 14:36:49 +01:00
Tom Page
b3b2585e99 Let git handle line endings for us. 2016-09-23 10:34:36 +01:00
Tuna Aksoy
aa8e1c1b32 RM-4095 (failing test after merging 2.3.0.x to 2.3) 2016-09-22 10:47:29 +01:00
Tuna Aksoy
717e2f85ba RM-4095 (failing test after merging 2.3.0.x to 2.3) 2016-09-22 10:45:57 +01:00
Tuna Aksoy
0f596a6e21 Merge branch 'release/V2.3' into release/V2.4
Conflicts:
	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java
	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/InplaceRecordPermissionTest.java
2016-09-22 10:39:50 +01:00
Tom Page
014e9662bc Let git handle line endings for us. 2016-09-21 14:55:10 +01:00
Ana Bozianu
8fd8782c8e Merge 2.4 merge fix into 2.5 2016-09-21 15:56:06 +03:00
Ana Bozianu
be9f4f6f04 fixed merge error 2016-09-21 15:40:27 +03:00
Ana Bozianu
4ce68e9039 Merge release/2.5 into master 2016-09-21 15:12:01 +03:00
Ana Bozianu
85db34ff48 Merge release/V2.4 into release/V2.5 2016-09-21 14:33:23 +03:00
Ana Bozianu
935d6319e1 Merge release/V2.3 into release/2.4 2016-09-21 11:58:40 +03:00
Tuna Aksoy
1d8bf3e67d Merge branch 'release/V2.5' into 'master'
Merge changes from release/V2.5 into master

See merge request !509
2016-09-20 23:27:32 +01:00
Tuna Aksoy
c3e480b649 RM-3902 (RM 2.5 Community Release) 2016-09-20 16:05:40 +01:00
Roxana Dina
7fd78f9768 RM-3913 FIXMEs should have JIRAs assigned to them.
Mention issue number next to Fixme's.
2016-09-06 16:00:49 +03:00
Roy Wetherall
f2cbb3628a RM-3027: Remove extended security when a record is copied 2016-08-22 17:17:43 +01:00
Roy Wetherall
3bd4d2d74b RM-3074: Deleted creators cause failures when declaring records 2016-08-22 15:06:43 +01:00
Roy Wetherall
7d30c1e9b0 RM-3074: Test group reuse 2016-08-22 08:43:30 +01:00
Roy Wetherall
79d2285bcb RM-3027: Fixed failing test 2016-08-19 13:03:19 +01:00
Roy Wetherall
5364779912 RM-3074: Fixup community integration tests 2016-08-19 12:21:50 +01:00
Roy Wetherall
c6f4561f8c RM-3074: Contributor didn't get write in-place access as expected
* owner derived from cm:creator was not added to writer list
* fully authenticated user in base test was being set incorrectly
* transaction executed outside authentication in BDT classes
2016-08-19 10:19:48 +01:00
Roy Wetherall
c000285a86 Merge branch 'master' of gitlab.alfresco.com:records-management/records-management into feature/remove-dynamic-authorities 2016-08-15 13:15:24 +10:00
Roy Wetherall
9de6c32046 RM-3074: Integration tests
* including fix for ghosted records being visible in collab sites
2016-08-15 13:14:53 +10:00
Roy Wetherall
bd460ba1e1 RM-3074: Integration Tests, including BDT test helpers to simplify code 2016-08-12 08:39:13 +10:00
Ana Bozianu
6e97900d63 Merge branch 'feature/RM-3512_QueryForAuthorities' into 'master'
Feature/rm 3512 query for authorities

RM-3512 - Add sorting/filtering capabilities for more than one field

Added canned query to retrieve the authorities so we can sort/filter by multiple fields. We support filtering by name pattern, authority type and clearance(new) and sorting by authority name, display name (new), authority type (new) and clearance (new).

Explaining the query:
  - all the authorities (users and groups) are under a common zone (APP_DEFAULT) whose node id I pass as parameters trough #{authorityContainerNodeId}
  - the authority name is either username (#{qnameUserName}) or group id (#{qnameAuthorityName}).
  - I build the display name by concatenating firstName lastName and groupName. Any user has firstName but not all groups have group names (the default groups only have group id). So if after concatenating the 3 properties the display name is null then we are dealing with a default group. In this case the display name will be the group id without the "GROUP_" prefix = substring(authorityName.string_value, 7)
  - there is no need for qname id null checks as I never pass null to the query. If I can't find a qname id in the database I simply pass INT_MIN so the qname won't match any row. This way the results are not altered and the query is easy to read.
  - the clearance and authority type are not ordered by natural order (ordering alphabetically would look random to the final user) but by a predefined order.

See merge request !410
2016-08-11 18:55:01 +01:00
Roy Wetherall
0c0abb4bb4 Merge branch 'master' of gitlab.alfresco.com:records-management/records-management into feature/remove-dynamic-authorities 2016-08-11 10:20:31 +10:00
Oana Nechiforescu
b9300fd503 Updated test to use Cut Off as action label. 2016-08-09 17:53:39 +03:00
Roy Wetherall
c7659f9b26 RM-3074: Rename getReader and getWriter methods 2016-08-09 15:06:48 +10:00
Roy Wetherall
30985f1784 RM-3074: Rename set/remove methods on extended security interface
* create deprecated service interface to tidy things up
* create set method and deprecate exisiting
* crate remove method and deprecate exisiting
* remove deprecation warnings in code
2016-08-09 12:01:16 +10:00
Roy Wetherall
b22d408bc5 RM-3074: Inplace move no longer needs to modify extended security
* inplace move no longer needs to store and reset extended security
* no need to clear extended security when assoc is removed
* a couple of extra checks to inplace move integration test
2016-08-09 10:27:16 +10:00
Ana Bozianu
656918ebf6 RM-3512 - added firstname to test users as alfresco doesn't support users with null first name 2016-08-08 11:40:17 +03:00
Roy Wetherall
0f676aa7f7 RM-3074: review comments 2016-08-08 11:04:30 +10:00
Roy Wetherall
9f5c4ba5eb RM-3074: Initial refactoring of the extended security service implementation 2016-07-29 13:04:23 +10:00
Roxana Lucanu-Ghetu
05d4c27439 Merge RM-3450_SDFCIntegration into feature/RM-3450_SFDCIntegration_MergeToMaster 2016-07-12 11:47:10 +03:00
Roy Wetherall
12b94dd396 Ensure that the test listeners are only loaded into the application context when the relevant test is executed. 2016-07-08 11:49:15 +10:00
Roxana Lucanu-Ghetu
771a13194b sync release/V2.4 into feature-2.4/RM-3450_SFDCIntegration 2016-07-05 11:54:19 +03:00
Roxana Lucanu-Ghetu
07227ed9e0 Called the method to test inside another transaction. 2016-06-30 12:00:23 +03:00
Roy Wetherall
9ff616467e Missing license headers 2016-06-29 14:34:39 +10:00
Roy Wetherall
850783b64a Merge RM-3227 from V2.3 to V2.4 2016-06-29 10:15:13 +10:00
Roxana Lucanu-Ghetu
1c7a84e481 Unit and integration test for RM-3450 2016-06-27 10:58:01 +03:00
Roxana Dina
f3663bcd58 RM-3265 Add test for the Move action on a destroyed record folder. 2016-06-22 20:27:26 +03:00
Roxana Lucanu-Ghetu
d9883a3b02 Merge branch 'feature-2.4/RM-3060' into 'release/V2.4'
Feature 2.4/rm 3060 - Record linked to folder with the same disposition schedule couldn't be cut off

Added search by name for current disposition action; when the record has multiple disposition schedules the current disposition action may not be found by id.

See merge request !157
2016-06-17 08:25:27 +01:00
Roxana Lucanu-Ghetu
b1db2fcd04 Changed the test a bit and uncommented intial fix, as we agree it's an workaround for the moment. 2016-06-16 15:50:35 +03:00
Roxana Lucanu-Ghetu
70f3071f39 Merge branch 'feature-2.4/RM-3300' into 'release/V2.4'
Feature 2.4/rm 3300

On versioning, document can be declared as record if adding record and version aspect is done running as System.
I noticed that the aspect is added only like this in other places where it is used; and the method for creating new recorded version, where the aspect is added, is not used in other places such that changing behavior elsewhere.

See merge request !152
2016-06-15 10:19:48 +01:00
Roxana Lucanu-Ghetu
5c8cc6fef2 Changed to BehaviourDrivenTest to be more obvious the steps and what is checked. 2016-06-15 12:01:47 +03:00
Roy Wetherall
36b6916a88 Changes to integration to better reflect the scenario to be tested 2016-06-09 13:53:07 +10:00
Mihai Cozma
c429005c33 RM-3341 - Outlook Integrations:Emails can be added to the Holds
/Transfers from Outlook Integration
2016-06-06 11:21:51 +03:00