Commit Graph

4525 Commits

Author SHA1 Message Date
Rodica Sutu
9fc190c5c7 Merge branch 'master' of git.alfresco.com:records-management/records-management into feature/RM-4568CreateElecWithRelativePath 2017-01-26 11:17:43 +02:00
Tuna Aksoy
793d1ae41a RM-4617: Removed workaround 2017-01-25 17:35:00 +00:00
Oana Nechiforescu
c86d428316 Merge branch 'release/V2.4' of https://git.alfresco.com/records-management/records-management into merge-2.5/Merge24To25RM-4520 2017-01-25 18:18:17 +02:00
Kristijan Conkas
bf802dae55 Merge remote-tracking branch 'origin/master' into feature/RM-4615_TAS_Binary_Request_Handler 2017-01-25 15:17:51 +00:00
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
Kristijan Conkas
9dd7a1cf22 RM-4615: get record content implementation 2017-01-25 15:14:59 +00:00
Tuna Aksoy
c32d34fddb RM-4617: Temporary solution to fix an issue on Bamboo 2017-01-25 14:59:47 +00:00
Kristijan Conkas
d475a49c41 RM-4615: javadoc tidy-up 2017-01-25 14:45:28 +00:00
Rodica Sutu
970cf4ee06 minor updates 2017-01-25 16:26:57 +02:00
Rodica Sutu
dd5b6bd26c -remove properties block 2017-01-25 16:19:44 +02:00
Rodica Sutu
a513235bbb -add tests for the issue RM-4568 2017-01-25 16:16:33 +02:00
Tuna Aksoy
a6d2c3c9b2 Merge branch 'feature/RM-4576_Completed_records_can_be_modified' into 'master'
RM-4576 (Completed records can be modified)

See merge request !5
2017-01-25 13:42:00 +00:00
Tuna Aksoy
7f72a6da22 RM-4576 (Updated the expected status code for the case when someone tries to modify the meta data of a closed record) 2017-01-25 13:42:03 +00:00
Kristijan Conkas
45fb371de7 RM-4615: TAS implementation of FilePlanComponentAPI.createElectronicRecord() 2017-01-25 13:30:29 +00:00
Rodica Sutu
d940b065d5 -add tests for the issue RM-4568 2017-01-25 14:12:33 +02:00
Tuna Aksoy
9b9110e745 RM-4576 (Addressed review comments) 2017-01-25 12:05:15 +00:00
Kristijan Conkas
10105b4c21 RM-4615: removed hardcoding 2017-01-25 11:32:12 +00:00
Tom Page
dab4cf405d RM-4159 Wrap the RestWrapper rather than extending it.
Previously we were hitting an issue where there were three beans all of the
type RestWrapper. This meant that Spring could not determine which bean
should be used when autowiring.  By wrapping the RestWrapper we ensure there
is only one bean of that type, and so Spring knows which bean to use (in the
TAS code).  After some debate I decided against renaming the RMRestWrapper
as RestWrapperWrapper.
2017-01-25 11:07:11 +00:00
Kristijan Conkas
b37a34c4a9 RM-4615: taking TestData out of API wrapper to avoid compile-time problems. 2017-01-25 10:26:53 +00:00
Tom Page
9869a08acb RM-4159 Getting enterprise UI tests to run.
There's still currently an issue because we have two @Autowired @Primary beans of the same type.
2017-01-25 08:31:42 +00:00
Kristijan Conkas
8d96550de3 RM-4615: TAS bump-up + corresponding api wrapper changes 2017-01-24 18:15:41 +00:00
Tom Page
b74b84ab07 MNT-16881 Fix typo in unit test.
Due to the lack of ordering in hash sets, this was passing locally but
failing on Bamboo with a NPE.
2017-01-24 11:45:39 +00:00
Tom Page
3b6204873b MNT-16881 Fix unit test and write an additional one. 2017-01-24 11:30:26 +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
Tom Page
ad656729c9 MNT-16881 Add CreateChild permission to the write group.
Note that the RM permission code in RecordsManagementPermissionPostProcessor
is not navigating the permission group hierarchy correctly. This is a simple
fix to solve the issue referenced, but the full fix will go into master.
2017-01-24 11:21:35 +00:00
Tuna Aksoy
eb37d0c08d Updated Alfresco dependency for RM Community (Repo -> 5.2.e, Share -> 5.2.d) 2017-01-23 23:01:31 +00:00
Tuna Aksoy
20e4fe77a0 Merge branch 'master' into feature/RM-4576_Completed_records_can_be_modified 2017-01-21 22:07:22 +00:00
Tuna Aksoy
026f9bbb49 RM-4576 (Completed records can be modified) 2017-01-20 22:58:43 +00:00
Tom Page
ffcf284c03 Merge branch 'merge/RM-3854_LockMethodSecurity' into 'master'
Merge/rm 3854 lock method security

Merge fix to lock method security context and shortening of test name to master.

See merge request !18
2017-01-20 15:01:10 +00:00
Silviu Dinuta
c38db892b6 Merge branch 'feature/RM-4568_relativePathForUploadRecords' into 'master'
Feature/rm 4568 relative path for upload records

See merge request !21
2017-01-20 10:49:32 +00:00
Silviu Dinuta
a59e42caca RM-4568: removed some formating 2017-01-19 16:57:36 +02: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
8e025c2143 RM-3854 Merge release/V2.5 into master. 2017-01-18 13:52:01 +00: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
David Webster
e35773af7a Merge branch 'feature-2.5/RM-3854_Add_isLocked_security_context' into 'release/V2.5'
RM-3854: Add access control mapping for LockService.isLocked method

Add mapping for LockService.isLocked method. JIRa refers to two new mapping required, but I've only added one as the other was added in RM-4259.

See merge request !10
2017-01-16 15:31:16 +00:00
Tom Page
07a9c684de RM-4262 Refactor common code for making paged queries. 2017-01-16 14:24:51 +00:00
David Webster
408956976b RM-3854: Add access control mapping for LockService.isLocked method 2017-01-13 11:26:19 +00:00
Tuna Aksoy
3c243af904 Merge branch 'feature/RM-4586_Record_can_be_declared_a_record_2' into 'master'
Feature/rm 4586 record can be declared a record 2

See merge request !730
2017-01-10 11:47:45 +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
Tuna Aksoy
0662919995 Merge branch 'feature/RM-4586_Record_can_be_declared_a_record' into 'master'
Feature/rm 4586 record can be declared a record

See merge request !728
2017-01-09 16:24:36 +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
Kristijan Conkas
fa42135ac8 Merge branch 'feature/RM-4550_Declare_Document_as_Record_API_Tests' into 'master'
Feature/rm 4550 declare document as record api tests

REST API tests for RM-4429.

See merge request !726
2017-01-08 20:57:56 +00:00
Kristijan Conkas
1e57b09299 RM-4550: fixes further to code inspection 2017-01-08 20:57:31 +00:00
Ana Bozianu
eb412fa999 RM-4572 - check if node still exists 2017-01-07 20:56:14 +02:00
Ana Bozianu
6134f494df RM-4572 - make the record id editable only in the transaction the record is created 2017-01-07 15:55:34 +02:00
Kristijan Conkas
1ae6485669 RM-4550: fixed indentation 2017-01-06 16:59:57 +00:00