Commit Graph

366 Commits

Author SHA1 Message Date
Tom Page
4fac165cdb Merge branch 'feature/MNT-16881_PermissionHierarchyCheck' into 'master'
MNT-16881 Check permission hierarchy using PermissionModel.

See merge request !28
2017-01-25 15:17:34 +00:00
Tom Page
7bcb119981 MNT-16881 Check permission hierarchy using PermissionModel.
Use the permission group hierarchy to determine whether the configured
permissions imply the queried permission or not.
2017-01-24 11:30:26 +00:00
Tuna Aksoy
026f9bbb49 RM-4576 (Completed records can be modified) 2017-01-20 22:58:43 +00:00
Silviu Dinuta
397730876b RM-4568: extended upload method to support relativePath creation and
minor change in specification
2017-01-19 16:53:19 +02:00
Tom Page
a7b698750b Merge branch 'feature/RM-4262_ClassificationGuideJavaAPIInterface' into 'master'
Feature/rm 4262 classification guide java api interface

RM-4262 Create Java public API interface for classification guide CRUD.

Also update the yaml file slightly.

See merge request !3
2017-01-17 16:00:09 +00:00
Tom Page
64b0e89773 RM-4262 Remove the ClassificationGuideQueryParams class.
We can just use the generic QueryParams class instead.

Also rename SortField to QueryField, as it might later be used for
e.g. filtering too.
2017-01-17 09:17:58 +00:00
Tom Page
07a9c684de RM-4262 Refactor common code for making paged queries. 2017-01-16 14:24:51 +00:00
Tuna Aksoy
0cb8ec59e6 RM-4586 (Record can be declared a record) / RM-4587 (Folder in collaboration site can be declared a record) 2017-01-09 20:52:33 +00:00
Tom Page
932c54adad RM-4586 Remove a couple of instances of string concatenation in debug logging.
Note that many other instances in this file cannot be improved as the same
message is also needed for an exception message.
2017-01-09 15:54:09 +00:00
Tuna Aksoy
5b9cefd4b0 Fixed review comment. 2017-01-09 14:46:33 +00:00
Tuna Aksoy
89bb46c10d Fixed review comments. 2017-01-09 14:41:48 +00:00
Tuna Aksoy
ab3f035f4b RM-4586 (Record can be declared a record) / RM-4587 (Folder in collaboration site can be declared a record) 2017-01-09 11:59:27 +00:00
Ana Bozianu
bbba5ff777 RM-4436 and RM-4549 - unit tests for record api 2017-01-04 17:57:10 +02:00
Tuna Aksoy
a80d4a523e Updated license headers 2017-01-01 11:52:56 +00:00
Oana Nechiforescu
ed1a27d159 Merge merge/upgradeTestDataFrom25 into master. 2016-12-23 13:38:53 +02:00
Oana Nechiforescu
f2ba4c04eb Merge branch 'release/V2.5' of https://gitlab.alfresco.com/records-management/records-management into merge/upgradeTestDataFrom25
# Conflicts:
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java
2016-12-22 15:29:10 +02:00
Tuna Aksoy
c9dd90f746 Merge branch 'feature/FileAndDeclareApi'
Conflicts:
	rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/nodes/RecordsEntityResource.java
2016-12-20 20:51:33 +00:00
Mihai Cozma
4630c5ba9a MNT 16971 Unable to set an read only alfresco rm
- remove commented code
2016-12-19 16:01:52 +02:00
Mihai Cozma
38fa3baab7 MNT-16971 Unable to set read only using property server.allowWrite=false
-fix transactions permission 
-fix document library view
2016-12-19 15:52:26 +02:00
Ana Bozianu
4f95c905a6 RM-4436 - implemented file record
RM-4429 - implemented declare record
-renamed the nodes package into fileplancomponents
2016-12-17 23:22:12 +02:00
Ana Bozianu
ede1386710 RM-4418 - added comments and localization 2016-12-16 14:27:01 +02:00
Ana Bozianu
9701b0020f RM-4418 - removed posibility to update content 2016-12-16 11:39:11 +02:00
Ana Bozianu
88d64bc233 RM-4528 - extract original exception so it can be properly mapped to api error code 2016-12-10 14:01:16 +02:00
Ana Bozianu
3b1c13b626 RM-4359 - added mandatory check and javadoc 2016-11-29 17:44:44 +02:00
Ana Bozianu
64f41ee66f RM-4359 - added records endpoint with get/update content requests 2016-11-25 17:36:29 +02:00
Tuna Aksoy
b6fdb18124 RM-4399 (Update Alfresco dependency for RM Community to 5.2.b) 2016-11-23 19:43:25 +00:00
Ana Bozianu
316bb4919c RM-4360 - added documentation and fixed an error code 2016-11-23 17:31:39 +02:00
Ana Bozianu
f487877b1c RM-4376 - create RM relative path + unit tests 2016-11-21 17:11:37 +02:00
Roxana Lucanu-Ghetu
a2c5c11de4 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
28026941c3 RM-4357 - return null when allowableOperations is empty 2016-11-17 14:50:17 +02:00
Ana Bozianu
d10fcea5fa RM-4357 - delete unused methods after merge 2016-11-17 11:38:17 +02:00
Ana Bozianu
3bb40fb88c Merge master into feature/RM-4357_and_RM_4373 2016-11-17 11:37:04 +02:00
Silviu Dinuta
9f7d772ac5 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
b660169e6a Merge master into feature/RM-4293_RM_special_containers_can_be_deleted 2016-11-17 10:53:25 +02:00
Ana Bozianu
54717418e1 Revert "Merge branch 'feature/RM-4357_AllowableOperations' into 'master'"
This reverts commit ab93e7b9c0, reversing
changes made to 0e74642b32.
2016-11-17 10:52:40 +02:00
Ana Bozianu
ba9807118c Revert "Merge branch 'feature/RM-4357_AllowableOperations' into 'master'"
This reverts commit ba4c99bbb5, reversing
changes made to 618fb9d4a0.
2016-11-17 10:52:00 +02:00
Silviu Dinuta
774b9bb00a RM-4293: review updates 2016-11-17 10:45:58 +02:00
Ana Bozianu
6551b12c67 Merge master into feature/RM-4373_SpecialContainersEditable 2016-11-17 10:35:46 +02:00
Ana Bozianu
ba4c99bbb5 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
0938d8ad4d RM-4357 - allow create children for fileplan 2016-11-17 10:26:58 +02:00
Oana Nechiforescu
618fb9d4a0 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
5045dd69fa Merge master into feature/RM-4373_SpecialContainersEditable 2016-11-17 09:44:50 +02:00
Ana Bozianu
ab93e7b9c0 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
891f67782a 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
70ba4da0af 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
f441ab71dd 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
8b172ac8e9 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
51f99f1846 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
66873aa7e6 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
aedcf1fa53 RM-4083 - handle hierarchical marks 2016-11-15 11:09:32 +02:00