Commit Graph

131 Commits

Author SHA1 Message Date
Roy Wetherall
e84a2bda84 Merge outstanding commits from V2.4 2016-07-06 12:24:24 +10:00
Roxana Dina
57b5547167 Revert "Merge branch 'feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into 'release/V2.4'"
This reverts commit 3550fe3a28, reversing
changes made to f87d5ca0b806ba4fc8086365ebf932c65bf350b2.
2016-07-05 15:48:51 +03:00
Roxana Dina
3550fe3a28 Merge branch 'feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into 'release/V2.4'
Feature 2.4/rm 3265 no option to move a destroyed record folder

RM-3265 No option to move a destroyed record folder.

Disable "Move" action for closed record folder. Change the
display order of the actions for destroyed record folders so that it
remains consistent with the order at other dispositions steps. Rename
Movable(CapabilityCondition) to MovableRecordFolder(CapabilityCondition)
as this condition is designed especially for record folders.

See merge request !277
2016-07-05 10:57:28 +01:00
Roy Wetherall
850783b64a Merge RM-3227 from V2.3 to V2.4 2016-06-29 10:15:13 +10:00
Roxana Lucanu-Ghetu
dc933bc80c Merge branch 'feature/RM-3286' into 'master'
Feature/rm 3286

Merge into master

See merge request !281
2016-06-28 21:28:59 +01:00
Roxana Lucanu-Ghetu
5de8289725 Merge branch 'feature/RM-3060_mergeToMaster' into 'master'
Feature/rm 3060 merge to master

Merge fix for record with multiple dispositions.

See merge request !280
2016-06-28 21:26:58 +01:00
Roxana Lucanu-Ghetu
c459c10e68 Merge RM-3286 2016-06-28 14:52:30 +03:00
Roxana Lucanu-Ghetu
f38f4b24f6 Merge RM-3060 into master 2016-06-28 11:49:36 +03:00
Roxana Lucanu-Ghetu
ee428af92f Merge commit '5f8225360a1f322d2522171edc04aa7a54da41b3' into feature/RM-3300_mergeToMaster 2016-06-28 11:39:49 +03:00
Roxana Dina
7fd7cf10f3 RM-3265 Disable "Move" action for closed record folder. Change the
display order of the actions for destroyed record folders so that it
remains consistent with the order at other dispositions steps. Rename
Movable(CapabilityCondition) to MovableRecordFolder(CapabilityCondition)
as this condition is designed especially for record folders.
2016-06-27 17:41:13 +03:00
Roxana Lucanu-Ghetu
3c67dc14f5 Merge branch 'master' of https://gitlab.alfresco.com/records-management/records-management into RM-3300_mergeToMaster 2016-06-27 16:58:24 +03:00
Tom Page
e25ff1c64a Merge feature/RM-3341_MergeToMaster into Everything. 2016-06-24 17:25:38 +01: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
Mihai Cozma
9d235a8286 Merge commit 'af7fe8' into RM-3341_MergeToMaster 2016-06-24 17:03:11 +03: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
00bb21a0fd Merge commit '51c7b1b59cb47bb4dd61a32ebf8defc1d698fd87' into RM-3300_mergeToMaster
RM-3300
2016-06-24 13:45:50 +03:00
Roxana Lucanu-Ghetu
e94ba209c1 Merge commit '56190f0cb11840ae1d773fbd53ced19111ea7535' into RM-3300_mergeToMaster
RM-3300
2016-06-24 13:41:08 +03: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
Tom Page
2d539f639d RM-3566 Update security controls API.
Create a Java API to allow adding and removing specified security controls
without affecting other marks on the node.
2016-06-23 15:05:15 +01: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
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
Roy Wetherall
36b6916a88 Changes to integration to better reflect the scenario to be tested 2016-06-09 13:53:07 +10:00
Tom Page
80bb28d782 Refactor WebScriptUtils to have consistent capitalisation of JSON.
Also fix capitalisation in putValuetoJSONObject (so that it's now
putValueToJSONObject).
2016-06-06 14:55:56 +01: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
Tuna Aksoy
40651b50ed Merge branch 'master' into feature/RM-2868_Create_Mark_Selection_Widget 2016-04-28 15:39:12 +01:00
Tom Page
6f8fecae4b RM-3344 Ensure we are not downgrading admin or upgrading guest.
This is a first pass at preventing changes to the clearance of admin or guest.
Previously we weren't allowing any changes to their clearance, but when
working with security markings, admin in particular needs to occasionally gain
a new mark when a custom group is created.  Currently that clearing is not
happening, but this change does not prevent it, if needed.

Also remove an unused method from the CaveatMarkingServiceImpl, as the class
is already very full.
2016-04-27 16:12:11 +01:00
Tuna Aksoy
2a0b8d46a8 RM-3276 (Edit and Application of Marks to a Single User) 2016-04-27 13:37:18 +01:00
Tom Page
4d14d17fb4 Merge branch 'xperimental/RM-2812_MarkPublicAPIs' into 'master'
Xperimental/rm 2812 Mark Public APIs

First attempt to mark classes that should be part of the public API with \@AlfrescoPublicAPI.

I have also added a couple of \@deprecated annotations to classes where I thought it made sense, and
added comments to classes that I wanted to add to the public API but couldn't (due to their contract
being dependent on non-public API classes).

See merge request !138
2016-04-27 09:23:58 +01:00
Tom Page
365090abdf RM-2812 Finalisation of first pass of classes to annotate. 2016-04-27 09:15:37 +01: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
Tom Page
c49a15c375 RM-2812 Add audit service and dependencies.
Having thought about this more, I don't think there's any problem adding
a deprecated class to the public API, as long as it's clearly marked as
such. It's deprecated at the moment because we think people might be using
it, but we want them to migrate to something else. Declaring this as part of
the public API formalises this process.

The RecordsManagementAuditService has the following dependencies:

RecordsManagementAuditQueryParameters <- RecordsManagementAuditService
RecordsManagementAuditEntry <- RecordsManagementAuditService
AuditEvent <- RecordsManagementAuditService
2016-04-20 16:24:44 +01:00
Tom Page
ebd8e09f88 RM-2812 Update following review comments.
The class dependency used to determine the classes to include based on the initial services is:

Depth 0: Service interfaces.

Depth 1:
ClearanceLevel <- SecurityClearanceService
RecordsManagementActionCondition <- RecordsManagementActionService
ClassificationAspectProperties <- ContentClassificationService
Version <- RecordableVersionConfigService, RecordableVersionService
Role <- FilePlanRoleService
CaveatGroupType <- CaveatSchemeService
RecordsManagementEvent <- RecordsManagementEventService
Group <- CapabilityService
RelationshipDisplayName <- RelationshipService
RecordsManagementActionResult <- RecordsManagementActionService
RecordsManagementAction <- RecordsManagementActionService
Relationship <- RelationshipService
ProtectedModelArtifact <- ModelSecurityService
ReportGenerator <- ReportService
RecordsManagementSearchParameters <- RecordsManagementSearchService
SecurityClearance <- SecurityClearanceService
SortDirection <- CaveatSchemeService
RecordsManagementEventType <- RecordsManagementEventService
Report <- ReportService
UserQueryParams <- SecurityClearanceService
CaveatMarkSortField <- CaveatSchemeService
ProtectedProperty <- ModelSecurityService
RelationshipDefinition <- RelationshipService
Capability <- FilePlanRoleService, CapabilityService
ExemptionCategory <- ClassificationSchemeService
CaveatGroup <- CaveatMarkingService, CaveatSchemeService
ClassificationReason <- ClassificationSchemeService
ProtectedAspect <- ModelSecurityService
MetadataReferral <- ReferralAdminService, ReferredMetadataService
CaveatMark <- CaveatClearanceService, CaveatMarkingService, ContentClassificationService, CaveatSchemeService, ClassificationSchemeService
SavedSearchDetails <- RecordsManagementSearchService
IdentifierGenerator <- IdentifierService

Depth 2:
RecordsManagementActionConditionDefinition <- RecordsManagementActionCondition
ReferralRegistry <- MetadataReferral
ClassificationSchemeEntity <- ExemptionCategory, ClassificationReason
RecordsManagementActionDefinition <- RecordsManagementAction
ReportDetails <- SavedSearchDetails
SortItem <- RecordsManagementSearchParameters
SavedSearchDetailsCompatibility <- SavedSearchDetails

Depth 3:
RecordsManagementModel <- SavedSearchDetailsCompatibility

Depth 4:
RecordsManagementCustomModel <- RecordsManagementModel
2016-04-20 16:14:07 +01:00
Ana Bozianu
30d1120005 Merge release/V2.4 into master 2016-04-20 18:04:27 +03:00
Ana Bozianu
3b40b746ad RM-3310 - added null check 2016-04-20 14:27:07 +03:00