inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,433 Commits 324 Branches 2,170 Tags
1c156789caeeae3c35e65f48b71137cf375a52f5
Commit Graph

116 Commits

Author SHA1 Message Date
Roxana Lucana-Ghetu
ea1dac281f 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
b2005355e3 RM-3274 - fixed invalid AuthenticationUtil bean refference 2016-04-12 14:59:02 +03:00
Tuna Aksoy
644d00671b 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
Ana Bozianu
bc44f9b49e RM-3266 - added an extra check when invoking onAddAspect 2016-04-11 20:04:26 +03:00
David Webster
66285af660 Merge branch 'release/V2.4' 2016-04-08 14:07:09 +01:00
Ana Bozianu
1b359ad083 RM-3216 - added unit test 2016-04-08 14:46:14 +03:00
Ana Bozianu
f2b31e9d6c RM-3216 - extended IMAP service and corrected method 2016-04-07 16:06:29 +03:00
Roxana Lucanu
d5efeec830 RM-3030 - renamed variable and changed comment 2016-04-06 17:52:38 +03:00
Roxana Lucanu
1de1bcf5f4 RM-3030 - added filePlan aspect for every thumbnail from renditions 2016-04-06 16:49:42 +03:00
Roy Wetherall
6486923ca8 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
d5031599fa 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
1c3cc3bbe4 Merge release/V2.4 into master 2016-04-04 09:55:10 +03:00
Roy Wetherall
2858241aed Merge branch 'feature-2.4/RM-3077_LinkedAndCutOffRecordsPropertiesNotAvailableForUsersWithNoAccessToLinkedFolder' into 'release/V2.4' 
Feature 2.4/rm 3077 linked and cut off records properties not available for users with no access to linked folder

Uses runAsSystem for obtaining instructions, recordCategory and categoryId in RecordsManagementNodeFormFilter.AddTransientProperties()

See merge request !94
 2016-04-04 01:59:29 +01:00
Ana Bozianu
5487aa1773 RM-2967 - added exists, null and empty checks to solve the problems 2016-04-01 19:02:29 +03:00
Silviu Dinuta
9908fc0c3d RM-3077 : Used runAsSystem to obtain disposition instructions, 
recordCategory and
categoryId
 2016-04-01 12:40:41 +03:00
Tuna Aksoy
5c30de9bb3 Merge branch 'release/V2.4' 
Conflicts:
	rm-community/rm-community-share/pom.xml
	rm-enterprise/rm-enterprise-share/pom.xml
 2016-03-31 15:29:35 +01:00
Roy Wetherall
ad07c548ee Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into feature-2.4/RM-3148-RuleInheritancePatch 2016-03-30 09:44:33 +11:00
Ana Bozianu
a8fd5726f2 Merge release/V2.4 into master 2016-03-24 14:39:40 +02:00
Roy Wetherall
813d3dee13 RM-3148 - File Plan containers rule inheritance patch implementation 2016-03-24 13:07:56 +11:00
Ana Bozianu
33e90196de RM-3000 - fixed issue for setPropertyValue, executeScript and sendEmail and added unit test 2016-03-23 13:03:34 +02:00
Tuna Aksoy
c33a401a3d RM-3132 (Update license headers) 2016-03-16 10:40:33 +00:00
Tuna Aksoy
85f3bf9afc Merge branch 'release/V2.4' 2016-03-16 10:32:35 +00:00
Tuna Aksoy
8fcc027af0 RM-3132 (Update license headers) 2016-03-16 10:26:58 +00:00
Tuna Aksoy
e00becde59 Merge branch 'release/V2.4' 2016-03-15 15:08:17 +00:00
Tuna Aksoy
3ca80f293f Merge branch 'release/V2.4' 
Conflicts:
	rm-automation/src/main/java/org/alfresco/po/rm/rules/fileplan/CreateFilePlanRulePage.java
	rm-community/.editorConfig
	rm-community/.jshintrc
	rm-community/pom.xml
	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtils.java
	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtilsUsageExamplesUnitTest.java
	rm-enterprise/pom.xml
	rm-enterprise/rm-enterprise-repo/pom.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/caveat-context.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/context/webscript-context.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/log4j.properties
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/caveat-model.properties
	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
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/model/caveatModel.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/module-context.xml
	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/templates/webscripts/org/alfresco/rma/caveat/caveatgroups.get.json.ftl
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ClearanceForAdminBootstrapComponent.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatException.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingService.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingServiceImpl.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOCache.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOFromJSONBootstrap.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOInterface.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/model/CaveatModel.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatAccessUtility.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatGroup.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatMark.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatSchemeService.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatSchemeServiceImpl.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/caveat/scheme/CaveatUtils.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationLevelManager.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeServiceImpl.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/permission/ClassificationPermissionPreProcessor.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupsGet.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/repo/jscript/app/CurrentClassificationPropertyDecorator.java
	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/repo/quickshare/ExtendedQuickShareServiceImpl.java
	rm-enterprise/rm-enterprise-repo/src/main/properties/local/alfresco-global.properties
	rm-enterprise/rm-enterprise-repo/src/main/resources/alfresco/module/alfresco-rm-server-enterprise/classification/rm-classification-reasons.json
	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/caveat/CaveatsBootstrapTest.java
	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationReasonsTest.java
	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassifyTest.java
	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/ClassificationRestApiTest.java
	rm-enterprise/rm-enterprise-repo/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml
	rm-enterprise/rm-enterprise-repo/src/test/resources/alfresco/module/alfresco-rm-server-enterprise/classification/rm-classification-reasons.json
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingServiceImplUnitTestBase.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingServiceImpl_NodeRefUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/CaveatMarkingServiceImpl_UserUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/TestOnlyCaveatSchemeService.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/caveat/dao/CaveatDAOFromJSONBootstrapUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationLevelManagerUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/SecurityClearanceServiceImplUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/permission/ClassificationPermissionPreProcessorUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/caveat/CaveatGroupsGetUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassifyContentPostUnitTest.java
	rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/repo/jscript/app/CurrentClassificationPropertyDecoratorUnitTest.java
	rm-enterprise/rm-enterprise-share/.jshintrc
	rm-enterprise/rm-enterprise-share/pom.xml
	rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/renderers/ClassificationLabel.js
 2016-03-15 12:10:53 +00:00
Roy Wetherall
2dfc8d0f27 Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into feature-2.4/RM-3148-FilePlanInheritedRulesNotFiring 2016-03-15 11:59:32 +11:00
Roy Wetherall
3768638ffe Remove now unessesary checks from rule execution (RM-3148) 2016-03-15 11:59:13 +11:00
Roy Wetherall
587a966477 Ensure that rules are not inherited onto the file plan, unfiled records, holds and transfers root containers (RM-3148) 2016-03-15 10:49:19 +11:00
Tuna Aksoy
ff1c81d825 RM-3132 (Update license headers) 2016-03-14 16:17:53 +00:00
Tuna Aksoy
f01d2e1d41 RM-3132 (Update license headers) 2016-03-14 16:07:46 +00:00
Tuna Aksoy
27c76455c8 RM-3132 (Update license headers) 2016-03-14 16:05:44 +00:00
Tuna Aksoy
4191ba9495 Reverted all license header related changes 2016-03-13 21:48:44 +00:00
Tuna Aksoy
5d1d814e13 RM-3132 (Update license headers) 2016-03-11 17:28:49 +00:00
Tuna Aksoy
224b1c4116 RM-3132 (Update license headers) 2016-03-11 17:05:12 +00:00
Tuna Aksoy
2e3a1fa270 RM-3132 (Update license headers) 2016-03-11 16:50:48 +00:00
Tuna Aksoy
9ab4e9e17e RM-3132 (Update license headers) 2016-03-11 16:44:23 +00:00
Roy Wetherall
89b05b3502 Add missing headers 2016-03-08 12:17:01 +11:00
Roy Wetherall
0131a72e8b Merge remote-tracking branch 'origin/release/V2.4' 2016-03-08 11:44:25 +11:00
Roy Wetherall
6ba4cabab4 Add missing headers 2016-03-04 10:16:19 +11:00
Roy Wetherall
1b0c83bf02 Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into RM-2969_UpdateLicenseHeaders 2016-03-04 09:05:15 +11:00
Roy Wetherall
0254b5166a Merge remote-tracking branch 'origin/release/V2.4' 2016-03-03 14:14:58 +11:00
Roy Wetherall
c0d044a0ec Merge remote-tracking branch 'origin/release/V2.4' 2016-03-03 14:02:18 +11:00
Roy Wetherall
c3ea2b5317 Merge remote-tracking branch 'origin/release/v2.4' into feature/RM-2700_CommunityOnEnterprise 2016-03-03 11:16:11 +11:00
Roy Wetherall
b2b4db3e41 Review feedback 2016-03-03 10:50:16 +11:00
Roy Wetherall
f98f0cb32b Refresh license headers to include changes to community license and module description 2016-03-03 10:38:37 +11:00
Roy Wetherall
2515ade37c Merge branch 'release/V2.4' of gitlab.alfresco.com:records-management/records-management into RM-2969_UpdateLicenseHeaders 2016-03-01 13:16:51 +11:00
Roy Wetherall
be365f98ba Add managed license headers to community projects for java, js and ftl source files. 2016-03-01 13:06:00 +11:00
Roy Wetherall
5059bd7cec Remove old license headers 2016-03-01 12:53:30 +11:00
Roy Wetherall
246823beab Fixed issues with detecting correct license 2016-02-29 13:52:17 +11:00
Ana Bozianu
45ff8cf39d Merge release/2.4 into master 2016-02-26 11:00:00 +02:00