Commit Graph

98 Commits

Author SHA1 Message Date
Tom Page
121381a384 Fix very minor issue with Javadoc strings. 2016-10-25 16:09:48 +01:00
David Webster
348128ef58 Merge 7289572a5dc380bab5dc53e09b802ad413869a58 from V2.3 to V2.4 w/ refactor for permissions post processor 2016-10-24 17:32:37 +01:00
Tuna Aksoy
d25b0423fb Merge branch 'release/V2.3' into merge-2.4/MergeV23ToV24_101016_2
# Conflicts:
#	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
#	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseWebScriptUnitTest.java
#	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get.html.ftl
#	rm-server/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/DispositionTestSuite.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
#	rm-server/unit-test/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGetUnitTest.java
2016-10-10 20:49:13 +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
Tom Page
014e9662bc Let git handle line endings for us. 2016-09-21 14:55:10 +01:00
Ana Bozianu
935d6319e1 Merge release/V2.3 into release/2.4 2016-09-21 11:58:40 +03:00
Roy Wetherall
c8e7c6272f Merge 4.2.0.1 to 2.4.1 2016-08-12 08:51:14 +10:00
Roxana Lucanu-Ghetu
a5ba1b3804 Created a property for AlfrescoRuntimeException instead ot the message. 2016-08-04 11:09:15 +10:00
Roxana Lucanu-Ghetu
d6e365ec6c Moved check for content to be done on commit. 2016-08-04 11:08:53 +10:00
Roxana Lucanu-Ghetu
ee6e676e0d Added check to allow creating only records inside a record folder. 2016-08-04 11:08:36 +10:00
Roy Wetherall
7a3d9e119d MNT-16535: non admin users can't file email records via outlook integration 2016-08-04 10:47:20 +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
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 Lucanu-Ghetu
e687fa40cf Merge branch 'feature-2.4/RM-3300' into 'release/V2.4'
Feature 2.4/rm 3300

See merge request !271
2016-06-24 15:46:34 +01:00
Roxana Lucanu-Ghetu
5f8225360a no message 2016-06-24 17:43:52 +03:00
Mihai Cozma
0ff85ba446 Merge branch 'feature-2.4/RM-3293_Audit_not_log_default_scheduled' into 'release/V2.4'
Feature 2.4/rm 3293 audit not log default scheduled

See merge request !242
2016-06-24 15:24:52 +01:00
Roxana Lucanu-Ghetu
c4c238c439 Merge branch 'feature-2.4/RM-3300' into 'release/V2.4'
Feature 2.4/rm 3300

Run code as system

See merge request !265
2016-06-24 14:46:38 +01:00
Roxana Lucanu-Ghetu
b626bfd888 Run the code as system, as some users may not have the rights to add the aspect. 2016-06-24 12:08:41 +03:00
Mihai Cozma
bf83f34716 RM-3293 RM Audit History does not log 2016-06-23 12:10:06 +03:00
Roxana Dina
39ee6e9c02 Merge remote-tracking branch 'origin/feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into release/V2.4 2016-06-17 17:28:17 +03:00
Roxana Dina
3d8f609c4c Change capability condition name. Add comments and version number. 2016-06-17 16:32:43 +03:00
Roxana Lucanu-Ghetu
4bb4783705 Changed check to throw exception when we try to create records from different types other than cm:folder 2016-06-17 12:25:22 +03:00
Roxana Lucanu-Ghetu
8f692811f9 Merge branch 'feature-2.4/RM-3286' into 'release/V2.4'
Feature 2.4/rm 3286

Changed behavior:is not possible to create a record folder inside another record folder from IMAP client.
When adding emails with attachments from Outlook client a hidden folder is created inside the record folder, to store the attachments.

See merge request !214
2016-06-17 10:06:43 +01:00
Roxana Lucanu-Ghetu
db390cfb8c Created a property for AlfrescoRuntimeException instead ot the message. 2016-06-17 12:05:19 +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 Dina
28551bb78a rm-3265 Add new capability condition to deal with displaying the "Move" action. 2016-06-16 14:00:28 +03:00
Mihai Cozma
69a20b7adf RM-3293 RM Audit History does not log Cutoff 2016-06-15 15:42:11 +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
96142085d8 Throw exception when trying to create records from different types other than cm:content 2016-06-14 12:27:17 +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
Roxana Lucanu-Ghetu
b372ff0900 Moved check for content to be done on commit. 2016-06-06 10:25:46 +03:00
Roxana Lucanu-Ghetu
8d8f5fb5c3 Added check to allow creating only records inside a record folder. 2016-06-03 11:10:18 +03:00
Roxana Lucanu-Ghetu
841c21df80 Changed test class and commented initial fix. 2016-06-01 17:41:36 +03:00
Mihai Cozma
7cb56b5c5c Create Hold and Transfer container exception 2016-05-31 18:16:32 +03:00
Roxana Lucanu
51c7b1b59c Added unit test 2016-05-17 12:13:42 +03:00
Roxana Lucanu
1c7e75c1b3 RM-3060 - making cut Off action available for record linked to folder with the same disposition schedule 2016-04-26 18:06:11 +03:00
Roxana Lucanu
56190f0cb1 RM-3300 - on versioning, document can be declared as record if adding record and version aspect is run as System 2016-04-25 11:55:53 +03:00
Ana Bozianu
3b40b746ad RM-3310 - added null check 2016-04-20 14:27:07 +03:00
Roxana Lucana-Ghetu
3b0540a19b Merge branch 'feature-2.4/RM-3285' into 'release/V2.4'
Feature 2.4/rm 3285

Added check not to be able to put null in cache, for nodes that are not records and don't have a filePlan.
Added unit test for it.

See merge request !128
2016-04-15 13:44:57 +01:00
Roxana Lucanu
fe0d6a543b RM-3285 - added null check for adding in cache 2016-04-15 13:34:30 +03:00
Silviu Dinuta
78a78017ab Merge branch 'feature-2.4/RM-3233_NonElectronicRecordsCanNotHavePropertiesChangedThroughRulesInUnfiledRecords' into 'release/V2.4'
Feature 2.4/rm 3233 non electronic records can not have properties changed through rules in unfiled records

When setting a foreground rule to change one properties for files that enter to a folder from Unfiled Records, when trying to create a nonElectronic record sometimes because it was very hard to reproduce this issue, SetPropertyValueActionExecuter is executed before adding the Record aspect from RecordsManagementContainerType.onCreateChildAssociation() and that's why it fails when checking UpdateProperties capability.

When creating "rma:nonElectronicDocument" document formprocessor is used and at some point updateNode from node service is used to update the properties. Therefore I made sure that each time when udating "rma:nonElectronicDocument" node the Record aspect is added if not present.

See merge request !124
2016-04-15 09:23:29 +01:00
Silviu Dinuta
8c3c02aca5 Added unit tests for NonElectronicRecordType and fixed typo 2016-04-14 18:54:41 +03:00
Silviu Dinuta
14bf20dcef Added @author and @since for the class 2016-04-14 15:24:30 +03:00
Ana Bozianu
b0b1a19b48 RM-3283 - added comment to explain change 2016-04-14 14:25:29 +03:00
Silviu Dinuta
8fe2973507 Added NonElectronicRecordType class to make sure that Record aspect is
added before entering in UpdatePropertiesPolicy for nonElectronic
documents
2016-04-14 12:06:39 +03:00
Ana Bozianu
896398c1ff RM-3283 - added extra check for hidden aspect + unit test 2016-04-14 11:28:21 +03:00
Ana Bozianu
de7718bb22 Merge branch 'feature-2.4/RM-3216_RegressionIMAP' into 'release/V2.4'
Feature 2.4/rm 3216 regression imap

RM-3274 - Error creating bean with name 'imapServiceBootstrap'

I added an invalid authentication util bean reference to the extended IMAP service and the setter was missing.

See merge request !117
2016-04-13 07:30:16 +01:00