Tuna Aksoy
39642b39a8
RM-4399 (Update Alfresco dependency for RM Community to 5.2.b)
2016-11-23 19:43:25 +00:00
Ana Bozianu
5b055daff3
RM-4360 - added documentation and fixed an error code
2016-11-23 17:31:39 +02:00
Ana Bozianu
9fc4a32454
RM-4376 - create RM relative path + unit tests
2016-11-21 17:11:37 +02:00
Roxana Lucanu-Ghetu
4a7154dbfb
Merge branch 'origin/feature/RM-3347_checkExclusiveClearanceHierarchicalMarks' into master
...
# Conflicts:
# rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/query/rm-query-context.xml
# rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/query/EnterpriseRecordsManagementQueryDAOImpl.java
2016-11-18 15:15:45 +02:00
Ana Bozianu
a15ff96e25
RM-4357 - return null when allowableOperations is empty
2016-11-17 14:50:17 +02:00
Ana Bozianu
0ced52873b
RM-4357 - delete unused methods after merge
2016-11-17 11:38:17 +02:00
Ana Bozianu
a05bcdb34c
Merge master into feature/RM-4357_and_RM_4373
2016-11-17 11:37:04 +02:00
Silviu Dinuta
e2659aa356
Merge remote-tracking branch 'origin/master' into feature/RM-4293_RM_special_containers_can_be_deleted
2016-11-17 11:10:28 +02:00
Silviu Dinuta
93674c191d
Merge master into feature/RM-4293_RM_special_containers_can_be_deleted
2016-11-17 10:53:25 +02:00
Ana Bozianu
521a0689a3
Revert "Merge branch 'feature/RM-4357_AllowableOperations' into 'master'"
...
This reverts commit 9b658e24523e1d740d76
2016-11-17 10:52:40 +02:00
Ana Bozianu
4d3703ba10
Revert "Merge branch 'feature/RM-4357_AllowableOperations' into 'master'"
...
This reverts commit 20e9fc986befe4165c9d
2016-11-17 10:52:00 +02:00
Silviu Dinuta
cad88f8679
RM-4293: review updates
2016-11-17 10:45:58 +02:00
Ana Bozianu
b026f86f67
Merge master into feature/RM-4373_SpecialContainersEditable
2016-11-17 10:35:46 +02:00
Ana Bozianu
20e9fc986b
Merge branch 'feature/RM-4357_AllowableOperations' into 'master'
...
Feature/rm 4357 allowable operations
trivial fix for allowable operation bug
See merge request !638
2016-11-17 08:31:43 +00:00
Ana Bozianu
1cfc8e93d6
RM-4357 - allow create children for fileplan
2016-11-17 10:26:58 +02:00
Oana Nechiforescu
efe4165c9d
Merge branch 'merge/Merge231ReleaseToMaster' into 'master'
...
Merge/merge231 release to master
See merge request !635
2016-11-17 08:09:12 +00:00
Ana Bozianu
df2d0f9b53
Merge master into feature/RM-4373_SpecialContainersEditable
2016-11-17 09:44:50 +02:00
Ana Bozianu
9b658e2452
Merge branch 'feature/RM-4357_AllowableOperations' into 'master'
...
Feature/rm 4357 allowable operations
RM-4357 - fileplanComponent's allowable actions don't reflect RM security
RM's capabilities overrides core's security so it is enough to test the capabilities. Please see the table from the issue's comment.
See merge request !624
2016-11-17 07:33:42 +00:00
Ana Bozianu
470dbbb5a5
RM-4373 - make transfers non editable because the rule inheritance is disabled on transfer container
2016-11-16 17:40:48 +02:00
Oana Nechiforescu
ad40d62807
Merge remote-tracking branch 'origin/release/V2.5' into merge/Merge231ReleaseToMaster
...
# Conflicts:
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/BaseTest.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/TestData.java
2016-11-16 17:33:33 +02:00
Ana Bozianu
abcfede1ae
RM-4357 - updated allowable operations to reflect the edit permissions changes for special containers made in RM-4373
2016-11-16 15:33:11 +02:00
Silviu Dinuta
bee71d2dbd
RM-4293: created capabilities for deleting transfer container and hold
...
container and restricted the deletion from behaviour beans
2016-11-16 15:09:58 +02:00
Silviu Dinuta
7ab2f753ad
RM-4293: prevent filePlan and unfiled Record container from behaviour
...
beans, also removed deleteNode method from RMNodesImpl and some unit
tests
2016-11-15 19:00:48 +02:00
Oana Nechiforescu
a40fb40951
Merge remote-tracking branch 'origin/release/V2.4' into merge-2.5/Merge231ReleaseIn25
...
# Conflicts:
# rm-automation/src/main/java/org/alfresco/po/common/util/Utils.java
# rm-automation/src/main/java/org/alfresco/po/rm/browse/fileplan/Record.java
# rm-automation/src/main/java/org/alfresco/po/rm/details/category/DispositionBlock.java
# rm-automation/src/main/java/org/alfresco/po/rm/details/record/RecordActionsPanel.java
# rm-automation/src/main/java/org/alfresco/po/rm/dialog/AuthoritySelectDialog.java
# rm-automation/src/main/java/org/alfresco/po/rm/dialog/addrelationship/DeleteRelationshipPrompt.java
# rm-automation/src/main/java/org/alfresco/po/rm/dialog/addrelationship/SelectRecordDialog.java
# rm-automation/src/main/java/org/alfresco/po/rm/disposition/edit/steps/EditDispositionSchedulePage.java
# rm-automation/src/main/java/org/alfresco/po/share/page/Message.java
# rm-automation/src/main/java/org/alfresco/po/share/rules/RuleActions.java
# rm-automation/src/test/java/org/alfresco/dataprep/RecordsManagementService.java
# rm-automation/src/test/java/org/alfresco/test/BaseTest.java
# rm-automation/src/test/java/org/alfresco/test/TestData.java
# rm-automation/src/test/java/org/alfresco/test/integration/classify/BrowseClassifiedRecords.java
# rm-automation/src/test/java/org/alfresco/test/integration/classify/ClassifyRecord.java
# rm-automation/src/test/java/org/alfresco/test/integration/classify/EditClassification.java
# rm-automation/src/test/java/org/alfresco/test/integration/classify/SearchClassifiedDocuments.java
# rm-automation/src/test/java/org/alfresco/test/integration/classify/SearchClassifiedRecords.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/disposition_schedule/DispositionScheduleLinkedRecords.java
# rm-automation/src/test/java/org/alfresco/test/integration/smoke/RecordsDispositionSchedule.java
2016-11-15 18:04:48 +02:00
Roxana Lucanu-Ghetu
5f2aceef43
RM-4083 - handle hierarchical marks
2016-11-15 11:09:32 +02:00
Ana Bozianu
14cde7a0f4
RM-4357 - added spcial container check for update
2016-11-15 10:47:11 +02:00
Ana Bozianu
dd86bd3cc7
RM-4357 - change addChildren capability and updated unit tests
2016-11-14 18:16:04 +02:00
Oana Nechiforescu
28b213a1ec
Merge remote-tracking branch 'origin/release/V2.3' into merge-2.4/Merge231AfterReleaseIn24
...
# Conflicts:
# rm-automation/src/main/java/org/alfresco/po/common/util/Utils.java
# rm-automation/src/main/java/org/alfresco/po/rm/disposition/edit/steps/EditDispositionSchedulePage.java
# rm-automation/src/main/java/org/alfresco/po/share/rules/RuleActions.java
# rm-automation/src/test/java/org/alfresco/test/TestData.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/addRelationship/AddRelationship.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/audit/AuditAccess.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/disposition_schedule/FoldersDispositionSchedule.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/node_browser/NodeBrowser.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/CopyToRuleOnFolders.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/FileToRuleAppliedOnUnfiledRecords.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/LinkToRuleOnFolders.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/MoveToRuleOnFolders.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/userDashboard/AdminDashboardMyDocumentsFilter.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/versions/RecordVersions.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/BasicRulesIntegration.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateCategories.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateElectronicRecords.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateFolders.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateNonElectronicRecords.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/DeclareInPlaceRecord.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/DeclareVersionAsRecord.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/FileUnfiledRecords.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/RecordsDispositionSchedule.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/RecordsDispositionScheduleWithGhosting.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/RejectRecord.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/SearchRecords.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/audit/AuditAccess.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/disposition_schedule/DispositionScheduleLinkedRecords.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/disposition_schedule/FoldersDispositionSchedule.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/node_browser/NodeBrowser.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/CopyToRuleOnFolders.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/FileToRuleAppliedOnUnfiledRecords.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/LinkToRuleOnFolders.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/MoveToRuleOnFolders.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/RulesAppliedOnWholeFilePlan.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/SetPropertyValueCollSiteAndFilePlan.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/userDashboard/AdminDashboardMyDocumentsFilter.java
# rm-automation/src/test/java/org/alfresco/test/integration/smoke/CreateCategories.java
# rm-automation/src/test/java/org/alfresco/test/integration/smoke/DeclareVersionAsRecord.java
# rm-automation/src/test/java/org/alfresco/test/integration/smoke/RecordsDispositionSchedule.java
# rm-automation/src/test/java/org/alfresco/test/integration/smoke/RecordsDispositionScheduleWithGhosting.java
# rm-automation/src/test/java/org/alfresco/test/integration/smoke/RejectRecord.java
# rm-automation/src/test/resources/coreTests.xml
# rm-automation/src/test/resources/testng.xml
2016-11-14 17:17:45 +02:00
Silviu Dinuta
b713fd146b
Merge master into feature/RM-4327
2016-11-14 14:08:09 +02:00
Silviu Dinuta
562b751345
RM-4368: change entity resource name from sites to ig-sites
2016-11-14 12:20:18 +02:00
Silviu Dinuta
7c4b03e9f4
RM-4327: extracted error messages for type restrictions in
...
action.service.properties
2016-11-14 11:21:32 +02:00
Silviu Dinuta
6891845cb3
RM-4367: restricted types created under record category and added unit
...
tests for RecordCategoryType
2016-11-14 10:20:00 +02:00
Ana Bozianu
a5da3040d7
RM-4357 - defined allowable operations using RM's capabilities
2016-11-11 18:30:14 +02:00
Silviu Dinuta
b31a075324
RM-4327: changed exception type on RecordFolderType and added unit tests
...
for the changes
2016-11-11 17:39:01 +02:00
Tom Page
99acb9351c
RM-4247 Merge master into RM-4247_UpdateDispositionProperty.
2016-11-11 08:21:58 +00:00
Silviu Dinuta
7753ccad06
RM-4327: changed InvalidParameterException with IntegrityException
2016-11-10 16:58:05 +02:00
Tom Page
fdf6b2055c
RM-2526, RM-4264 Merge release/V2.5 into master.
2016-11-10 14:02:56 +00:00
Silviu Dinuta
579ebdd2df
Merge branch 'feature/RM-4326' into 'master'
...
Feature/rm 4326
See merge request !607
2016-11-10 13:52:39 +00:00
Silviu Dinuta
0f8dd6f0e8
RM-4326: added some comments
2016-11-10 15:51:05 +02:00
Tom Page
9a66a6cf8c
RM-4247 Re-add changes that were meant to be merged from release/V2.5.
...
The merge in '5f75e3' missed the changes from RM-4247, so this commit adds
them back in.
2016-11-10 13:14:33 +00:00
Ana Bozianu
796a003392
RM-4330 - changed the code from internal server error to integrity exception
2016-11-10 14:15:51 +02:00
Tom Page
4e6eae75a3
RM-2526, RM-4264 Merge release/V2.4 into release/V2.5.
2016-11-10 10:52:59 +00:00
Silviu Dinuta
5e7be6cc5f
RM-4326: minor fix
2016-11-09 14:48:49 +02:00
Ana Bozianu
55fd1ec3c6
Merge merge-2.5/2.5.0.x_to_2.5 into release/V2.5
2016-11-09 14:41:13 +02:00
Silviu Dinuta
699021b8e0
RM-4326: extracted non unique types in a constant for RmSyteType create
...
association check
2016-11-09 13:27:33 +02:00
Silviu Dinuta
0b656e544a
RM-4326: undo some formatting
2016-11-09 12:51:14 +02:00
Silviu Dinuta
94e8664129
RM-4326: removed checkPostPermission method and changed RmSyteType to
...
handle allowed created types
2016-11-09 12:44:19 +02:00
Silviu Dinuta
9746ee9ff3
RM-4326: allow creation under hold type only from HoldServiceImpl
2016-11-08 20:40:51 +02:00
Silviu Dinuta
e999b68586
RM-4326: allow creation in transfer only from TransferServiceImpl
2016-11-08 18:41:15 +02:00
Silviu Dinuta
c6ca74ab26
RM-4326: allow creation in transfer only from TransferServiceImpl
2016-11-08 18:38:35 +02:00
