Commit Graph

4990 Commits

Author SHA1 Message Date
Roxana Lucanu
594d146c8e Merge release/V2.4 into master 2016-04-15 16:16:45 +03:00
Roxana Lucana-Ghetu
5b01cbaf43 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
6cbfab08e1 Changed class not to extend anymore BaseUnitTest class 2016-04-15 15:38:09 +03:00
Roxana Lucanu
f3ed3f9197 RM-3285 - added null check for adding in cache 2016-04-15 13:34:30 +03:00
Kristijan Conkas
7e1b112b59 Merge branch 'feature/RM-3284_UI_tests_are_failing' into 'master'
Feature/rm 3284 ui tests are failing

This change addresses the failing builds both on master and on latest Aikau build plan. It also bumps up the Aikau version to 1.0.63 (further to @dwebster's confirmation this one is good to use).

See merge request !125
2016-04-15 11:06:34 +01:00
Silviu Dinuta
e2c9524a07 Merged release/V2.4 into master 2016-04-15 11:32:34 +03:00
Silviu Dinuta
a5c1b69690 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
Tuna Aksoy
fbe8527b69 Merge branch 'release/V2.4' 2016-04-15 09:22:25 +01:00
Roxana Lucana-Ghetu
88ce7f91ca Merge branch 'feature-2.4/RM-2925_noOptionToDeleteDestroyedRecordFolder' into 'release/V2.4'
Feature 2.4/rm 2925 no option to delete destroyed record folder

RM-2925 - No option to delete destroyed record folder (which maintain record metadata after destroy)

Made Delete action available for destroyed record folder, added unit test class.

See merge request !92
2016-04-15 09:18:39 +01:00
Silviu Dinuta
5eaf78dc8e Changed NonElectronicRecortTypeUnitTest 2016-04-15 11:09:32 +03:00
Silviu Dinuta
eca36c48b2 Changed NonElectronicRecordTypeUnitTest 2016-04-15 10:41:53 +03:00
Ana Bozianu
34b7db52aa Merge release/V2.4 into master 2016-04-14 19:40:25 +03:00
Ana Bozianu
86236f3d27 Merge branch 'feature-2.4/RM-3283_OutlookIntegrationEmailWithAttachments' into 'release/V2.4'
Feature 2.4/rm 3283 outlook integration email with attachments

RM-3283 - Outlook Integration:Emails cannot be added to Unfiled Records (having a rule set) using Alfresco Outlook Integration

When adding emails with attachments in alfresco a hidden folder of type wpsmail-v2:attachment-folder (subtype of cm:folder) is added to hold the attachment files. When such an email is added in Unfilled Records container the RecordsManagementContainerType.onCreateChildAssociation policy is fired which transforms any subtype of folder into a record folder. When the rule tries to file this folder in another record folder we get an exception from trying to add a record folder in another record folder.

To fix this issue I added an extra check to avoid applying the conversion rule on hidden nodes. I also added a unit test for both hidden and non hidden folders.

See merge request !123
2016-04-14 17:39:08 +01:00
Silviu Dinuta
f8332dccae Added unit tests for NonElectronicRecordType and fixed typo 2016-04-14 18:54:41 +03:00
Kristijan Conkas
dc21c8219d Merge branch 'master' into feature/RM-3284_UI_tests_are_failing 2016-04-14 16:23:04 +01:00
Silviu Dinuta
0d52abc77e Added @author and @since for the class 2016-04-14 15:24:30 +03:00
Ana Bozianu
59c100af97 RM-3283 - added comment to explain change 2016-04-14 14:25:29 +03:00
Kristijan Conkas
6c09f516a8 RM-3284: Instructions for running tests against latest Aikau snapshot. 2016-04-14 11:20:27 +01:00
Ana Bozianu
3fe582f564 RM-3283 - added missing file header 2016-04-14 12:25:25 +03:00
Silviu Dinuta
0007fc3013 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
663c6175fc RM-3283 - added extra check for hidden aspect + unit test 2016-04-14 11:28:21 +03:00
Tom Page
747265e003 Merge release/V2.4 into master. 2016-04-13 10:16:57 +01:00
Tom Page
41cd9092bb Merge release/V2.3 into release/V2.4.
Conflicts:
	rm-community/rm-community-share/source/web/rm/components/console/rm-audit.js
	rm-community/rm-community-share/source/web/rm/components/console/rm-user-rights.js
2016-04-13 10:15:05 +01:00
Tom Page
f02538d3bd Merge release/V2.3.0.x into V2.3. 2016-04-13 10:10:10 +01:00
Tom Page
a3cd0fe62f Update version to 2.3.0.4-SNAPSHOT. 2016-04-13 09:07:57 +01:00
Tom Page
b6e5311243 Update version to 2.3.0.3. 2016-04-13 09:06:16 +01:00
Ana Bozianu
a0dc5a06d0 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
Roy Wetherall
2a2fa5e22d Merge branch 'hotfix/RM-3114-PatchFails' into 'release/V2.2.1.x'
Hotfix/rm 3114 patch fails

- Update release version to 2.2.1.5
- make admin service a listener, ordered to execute last
- protect service behaviours from execution until custom map is loaded
- integration tests

@abozianu and @onechiforescu please take a look at this too.

See merge request !86
2016-04-12 14:28:50 +01:00
Roy Wetherall
7af0399cbd RM-3114 - update version in POMs 2016-04-12 09:26:01 -04:00
Roy Wetherall
0585ea0a6b RM-3114 - review comments 2016-04-12 09:21:45 -04:00
Roxana Lucana-Ghetu
f4cc2e08cf Merge branch 'feature-2.4/RM-3030_PreviewNotAvailableDeclaredRecord' into 'release/V2.4'
Feature 2.4/rm 3030 preview not available declared record

RM-3030 - The documents declared as records in their Details page don't have the preview available afterwards.

I've noticed different behavior when doing steps in different order: if the file is declared as record before navigating to document details page, the error doesn't reproduce; if document details page is accessed first and after declare the file as record,  there is an Access Denied exception.
In the first case the node for preview has the File Plan aspect, in the second one it doesn't.

See merge request !105
2016-04-12 14:10:39 +01:00
Ana Bozianu
afd6570ba8 RM-3274 - fixed invalid AuthenticationUtil bean refference 2016-04-12 14:59:02 +03:00
gbroadbent
9e775daee5 DUTCH: Fixed reverted "workflow" term" files as per EN bundle rev-2016-04-08 2016-04-12 10:46:58 +01:00
Tuna Aksoy
7336d9da4b Merge branch 'release/V2.4'
Conflicts:
	rm-automation/src/test/java/org/alfresco/test/TestData.java
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_de.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_es.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_fr.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_it.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_ja.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_nb.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_nl.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_pt_BR.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_ru.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_zh_CN.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_de.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_es.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_fr.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_it.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_ja.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_nb.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_nl.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_pt_BR.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_ru.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_zh_CN.properties
2016-04-12 09:30:57 +01:00
Roy Wetherall
15c7309697 Merge branch 'feature-2.4/RM-3266_ForegroundRejectActionInUnfiledRecordsNotWorking' into 'release/V2.4'
Feature 2.4/rm 3266 foreground reject action in unfiled records not working

RM-3266 - Documents get into a "hybrid" state when the Unfiled records inherited from File Plan rule rejects declared records.

If we run the reject rule in foreground it will run in the same transaction with create-record. **CreateRecordAction** will move the file to RM site and add all the RM aspects to it (including rma:filePlanComponent) then **RejectAction** will move the file back to the collaboration site and remove all the RM aspects from it. Because the two actions run in the same transaction **FilePlanComponentAspect.onAddAspect** will run at the end of the transaction to set the property rma:rootNodeRef and apply the rma:filePlanComponent aspect on all the renditions. By setting the property rma:rootNodeRef the **rma:filePlanComponent** is added back on the node.

When listing the files in the community site these nodes match the rmDocLibRecord template becuse they have **rma:filePlanComponent** aspect but we fail to list them because they are not records. The rejected files should match rmDocLibRejectedRecord template.

I added an extra check in the onAddAspect method to make sure we don't add back RM properties if the aspect rma:filePlanComponent has been removed in the same transaction it has been added.

Another solution that worked is changing the notification frequency of the onAddAspect method from **NotificationFrequency.TRANSACTION_COMMIT** to **NotificationFrequency.EVERY_EVENT** but I think it will affect the performance a lot more.

See merge request !113
2016-04-11 19:38:14 +01:00
Ana Bozianu
6d82d89d18 RM-3266 - added an extra check when invoking onAddAspect 2016-04-11 20:04:26 +03:00
Ana Bozianu
b75281d2fb RM-3216 - removed verify statements as extendedImapServiceImpl is not a mock 2016-04-11 15:46:42 +03:00
gbroadbent
8af6e498da ITALIAN: Updated files as per EN bundle rev-2016-04-08 2016-04-11 12:05:42 +01:00
Tom Page
a83da7d1c4 Merge branch 'feature-2.4/RM-3216_ListRMFilesInIMAP' into 'release/V2.4'
Feature 2.4/rm 3216 list rm files in imap

RM-3216 - IMAP:Emails messages not available after adding a file and declaring as record

The problem is in Alfresco core in the method getPathFromSites from ImapServiceImpl. When declaring a file as a record the node becomes an Inplace Record and the primary parent becomes the Unfiled Records folder. The IMAP service tries to get the record path relative to the site so it goes recursively to the primary parent and checks if it reached the site node with the following condition:
```java
if (nodeService.getType(ref).equals(SiteModel.TYPE_SITE))
```

As the RM site is of type rma:rmsite this clause will fail and the method goes up to the root node which doesn't have any parent and we get a NullPointerException. The if condition should be:
```java
if (dictionaryService.isSubClass(nodeService.getType(ref), SiteModel.TYPE_SITE))
```

This is why no RM folder is listed trough IMAP.

To fix the issue I extended ImapServiceImpl and overwrote the method that needed to be fixed.

See merge request !107
2016-04-11 11:29:46 +01:00
Ana Bozianu
f3caa528f9 RM-3216 - added header to test file 2016-04-11 12:27:19 +03:00
David Webster
d3db151180 Merge branch 'release/V2.4' 2016-04-08 14:07:09 +01:00
Ana Bozianu
a48e690ad3 RM-3216 - added unit test 2016-04-08 14:46:14 +03:00
David Webster
fae7036fc6 L10N: Update path to ensure all localisation files are found 2016-04-07 17:10:15 +01:00
Ana Bozianu
6935c5ea36 RM-3216 - extended IMAP service and corrected method 2016-04-07 16:06:29 +03:00
Roxana Lucanu
bc5f60c5a0 RM-2925 - changed test type for delete action 2016-04-07 10:02:03 +03:00
Roxana Lucanu
8de82a81df RM-3030 - renamed variable and changed comment 2016-04-06 17:52:38 +03:00
Roxana Lucanu
e6d1757a3a RM-3030 - added filePlan aspect for every thumbnail from renditions 2016-04-06 16:49:42 +03:00
Roy Wetherall
c59d9d00c9 RM-3181, RM-3195: ensure JSON conversion component works when no file plan is found 2016-04-06 10:24:27 +10:00
Roy Wetherall
dc526e4a48 RM-3181 and RM-3195 - error accessing caveatConfig.json after modifications
Caveat config file had filePlanComponent applied, but wasn't contained
within a file plan.
2016-04-05 14:38:36 +10:00
Ana Bozianu
c162075eb6 Merge release/V2.4 into master 2016-04-04 09:55:10 +03:00