Commit Graph

719 Commits

Author SHA1 Message Date
David Webster
e34e41d61d Merge remote-tracking branch 'origin/release/V2.2.0.x' into release/V2.2 2016-10-18 16:36:10 +01:00
David Webster
34dfa8a648 MNT-16852: Optimise list conversion as per code review comment 2016-10-13 11:06:11 +01:00
David Webster
30831aa221 MNT-16852: Add comment explaining reason behind extracting mapping to properties file 2016-10-12 15:31:12 +01:00
David Webster
40135eb34e MNT-16852: Remove unnecessary imports 2016-10-12 15:25:06 +01:00
David Webster
fa2d37f37b MNT-16852: First pass at extracting permission mapping to properties file. 2016-10-12 15:08:17 +01:00
David Webster
0eaa927b38 MNT-16852: Fix issue reading properties in Outlook Integration 2016-10-12 09:22:14 +01:00
David Webster
674f929acf MNT-16852: Refactor hasPermission method for readability 2016-10-11 12:57:38 +01:00
David Webster
60dd571153 MNT-16852: Give write properties permission to file records 2016-10-11 12:51:25 +01:00
David Webster
60833cb131 MNT-16852: First pass at Write Properties permission handling 2016-10-06 21:59:11 +01:00
David Webster
ecbf4d1edc Merge remote-tracking branch 'origin/release/V2.2.0.x' into feature-2.2/merge-2.2.0.1 2016-09-30 15:35:04 +01:00
Tom Page
2e0cebc7c6 Let git handle line endings for us. 2016-09-27 13:55:53 +01:00
David Webster
2b4c6616bc MNT-16852: back port code fix for add children permission support 2016-09-26 22:17:24 +01:00
Mihai Cozma
f6c63e480f Fix audit issue 2016-09-19 15:06:13 +03:00
Mihai Cozma
d7cf26c236 Revert "Fix audit issue"
This reverts commit 189e3626e8.
2016-09-19 14:48:14 +03:00
Mihai Cozma
189e3626e8 Fix audit issue 2016-09-19 14:46:42 +03:00
Tom Page
6991c9b146 Let git handle line endings for us. 2016-09-08 16:27:10 +01:00
Tom Page
ae1e200920 Merge release/V2.2.1.x into release/V2.2.
Conflicts:
	pom.xml
	rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties
	rm-server/pom.xml
	rm-share/config/alfresco/module/org_alfresco_module_rm_share/module.properties
	rm-share/pom.xml
	rm-ui-tests/pom.xml
2016-06-20 10:31:36 +01:00
Roy Wetherall
0585ea0a6b RM-3114 - review comments 2016-04-12 09:21:45 -04:00
Roy Wetherall
d3662ae95f RM-3114 - Integration tests 2016-03-30 09:32:28 +11:00
Roy Wetherall
08e2ae4042 RM-3114: Prevent access to custom map before it is ready
- remove public init method from AdministrationService
- make admin service impl ordered listener, always goes last
- protect execution of service behaviours until custom map init'ed
2016-03-29 13:09:56 +11:00
Tatyana Valkevych
fc33aecf30 MNT-15068: Merged V2.2 to V2.2.1.x
109401: RM-2391 : The Audit Log GET requests have to verify first which user is logged in and to which data it has access.
      - Added capability checking to the AuditLog Get REST API. Added a unit test. Minor changes on the Share side to forward the forbidden status.
   111064: RM-2391 :
      - also check for the access audit capability on each node from the report
   114786: RM-2391 :
      - Implemented final fix and added a unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@115178 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-26 15:58:04 +00:00
Alexandru Balmus
a4a5f9e81b RM-2391 : The Audit Log GET requests have to verify first which user is logged in and to which data it has access.
- Implemented final fix and added a unit test.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@114786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-20 13:25:39 +00:00
Alexandru Balmus
e080f6e188 Reverse merged V2.2.1.x
<<< Need to use a different approach. >>>
         Merged DEV to V2.2.1.x
            114241: MNT-14900 : Alfresco doesn't work with Records Management
               - Fixed problem with circular references during Spring dependency injection process

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114605 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-16 14:14:03 +00:00
Alexandru Balmus
9f1900f06c Merged DEV to V2.2.1.x
114241: MNT-14900 : Alfresco doesn't work with Records Management
      - Fixed problem with circular references during Spring dependency injection process

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114437 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-15 13:18:14 +00:00
Andreea Dragoi
2929528213 RM-2522 : Select "Download Zip" (rm-download-zip) on RM Transfer Target inside RM Transfer view throws 400 Bad Request: Node is not fileplan
- used isFilePlan method from FilePlanService instead of old check

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@114258 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-13 13:32:34 +00:00
Tom Page
1855987fe9 Merged BRANCHES/V2.2.1.x to V2.2:
103185: RM-2162: Records Management patch RMv22DODModelSeparationModulePatch taking too long with large amount of records


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@111793 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-09 15:37:04 +00:00
Alexandru Balan
86f8c7de37 RM-2391 - also check for the access audit capability on each node from the report
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@111064 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-28 06:09:45 +00:00
Alexandru Balan
5a45f6d1d1 RM-2271 - added the job lock refresh mechanism so that for long running jobs that exceed the locks TTL the lock will be refreshed.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@109406 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-03 09:27:17 +00:00
Alexandru Balan
2e1d81ef2e RM-2391 - Added capability checking to the AuditLog Get REST API. Added a unit test. Minor changes on the Share side to forward the forbidden status.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@109401 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-03 08:43:40 +00:00
Roy Wetherall
2c3bdc01cd RM-2162: Records Management patch RMv22DODModelSeparationModulePatch taking too long with large amount of records
* added configuration property that allows existing DoD RM site to be converted to standard RM site
 * added deprecated properties back into rma namespace to avoid loss of data
 * patches to move properties into DoD namespace not executed if not required
 * removed a couple of references to moved properties that still existed
 * ensure address properties are moved if required

+review RM



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@103185 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-30 04:42:25 +00:00
Tuna Aksoy
f695bcab1a Merged BRANCHES/V2.2.1.x to BRANCHES/V2.2:
102241: RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
   102242: RM-1100 (Uncaught LockAcquisitionException in RM 2.0.4)
   102267: RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
   102269: RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
   102279: RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
   102486: RM-2072: Concurrency exceptions and deadlocks on Records Management "File to" rule
   102636: RM-2191 ("Create Category" and "Manage Permissions" buttons are enabled for user with read-only permissions)
   102675: RM-2190 (Concurrency exception when upload document to several folders with rules configured to file records)
   102687: RM-2192 (User has no access to the recorded document after it was filed)
   102698: Removed warnings
   102699: .ant-targets-build.xml files added to svn:ignore
   102700: .ant-targets-build.xml files added to svn:ignore
   102701: RM-2190 (Concurrency exception when upload document to several folders with rules configured to file records)
   102756: RM-2192 (User has no access to the recorded document after it was filed)
   102762: Commented out intermittently failing test
   102795: (RECORD ONLY) Deploy RM 2.2.1.1 on Maven Repository
   102807: (RECORD ONLY) Changed the artifact version to 2.2.1.2-SNAPSHOT

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@103037 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-29 08:35:10 +00:00
Tuna Aksoy
bdf680f034 RM-2192 (User has no access to the recorded document after it was filed)
+review RM-37

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102756 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-27 13:21:10 +00:00
Tuna Aksoy
f37a5090b4 Removed warnings
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-26 14:15:02 +00:00
Tuna Aksoy
67157be80e RM-2192 (User has no access to the recorded document after it was filed)
+review RM @rwetherall

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-25 13:51:08 +00:00
Tuna Aksoy
5015fd62ea RM-2190 (Concurrency exception when upload document to several folders with rules configured to file records)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-24 23:26:37 +00:00
Tuna Aksoy
40ea38c9b5 RM-2191 ("Create Category" and "Manage Permissions" buttons are enabled for user with read-only permissions)
+review RM @rwetherall

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102636 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-24 14:23:03 +00:00
Roy Wetherall
3bc42959e3 RM-2072: Concurrency exceptions and deadlocks on Records Management "File to" rule
* unit test provides easy way to reproduce (number of batches and size configurable)
* 500 docs now being added via described scenario
* extended security props no longer being set up the hierarchy (which was leading to terminal deadlocks)

+review RM @taksoy



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102486 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-24 04:16:59 +00:00
Tuna Aksoy
7d1aa04d04 RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102267 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-21 17:49:48 +00:00
Tuna Aksoy
0a4f80ea5b RM-1100 (Uncaught LockAcquisitionException in RM 2.0.4)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102242 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-21 13:07:27 +00:00
Tuna Aksoy
3efe5b4202 RM-2072 (Concurrency exceptions and deadlocks on Records Management "File to" rule)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@102241 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-21 13:06:53 +00:00
Tuna Aksoy
8b62190595 RM-193 (Roles are displayed incorrectly in User Rights Report)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@101230 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-07 10:16:15 +00:00
Alexandru Balan
c77dc45437 RM-1586 : Add another search for the property in the case of legacy html encoded properties
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@100725 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-30 15:14:49 +00:00
Roy Wetherall
c03b3eb232 RM-2058: RM Manager can't access Users and Groups (after upgarde)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99471 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-15 23:48:58 +00:00
Roy Wetherall
e9471b310f Merged V2.3 to V2.1.1:
96823: RM-1903 (Can't manage permissions without "Manage Access Controls" capability)
   97435: RM-1903: Can't manage permissions without "Manage Access Controls" capability
   97436: RM-1903 - updates to unit tests
   97595: RM-1903 (Can't manage permissions without "Manage Access Controls" capability)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99374 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-12 23:14:33 +00:00
Roy Wetherall
b605635eb6 Merged HEAD to V2.2:
89735: RM-1677- No items error for RM Admin if record was declared from moderated/private site

* fixes RM-2018



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99089 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-10 04:32:04 +00:00
Roy Wetherall
ef7c4d6761 RM-2026: Unable to complete historical records when mandatory meta-data missing
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99088 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-10 03:10:49 +00:00
Roy Wetherall
29e366cfab Merged V2.3 to V2.2:
96580: RM-1904 (SubCategory moved to root have inheritance on)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99086 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-09 21:57:32 +00:00
Roy Wetherall
c753763291 Merged V2.3 to V2.2:
92881: RM-1799 (Root category is not displayed for the non-rm-admin user who created it)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99085 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-09 21:53:53 +00:00
Alexandru Balan
b5f20f7fdd RM-1586 - server-side fix for legacy custom property names that might contain spaces
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@97533 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-20 08:08:42 +00:00
Alexandru Balan
b4ea65bb2c RM-1932 Changed the notification frequency based on 2.3 code changes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@97445 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-19 07:58:30 +00:00