Tom Page
277d9aabbd
RM-5481 Handle empty string as a reason or exemption id.
...
If the empty string is passed as a classification reason or exemption id then the API framework
converts it to null for us. We should throw a 404 (not found) error, because there are no reasons
or exemptions with the empty string as their id (or null for that matter). Add two new REST API
tests for these cases.
Also stopped using the helper method addParam in TopicsWithInstructionsTest, as it is only saving us
about ten characters, causes an extra import and includes an explicit mention of the topicsApi
inside it (i.e. it doesn't work at all with the guidesAPI).
2017-08-03 13:10:37 +01:00
Tom Page
88a3c42750
RM-5309 Merge release/V2.5 into master.
2017-07-24 18:49:10 +01:00
Tom Page
7e1b33dad7
MNT-18083 Merge release/V2.5 into master.
2017-07-24 18:45:44 +01:00
Tom Page
cb31194cb1
RM-5420 Code review fixes including move toIndentedString into a helper method.
2017-07-24 15:53:35 +01:00
Ramona Popa
1eb4e09a83
RM-5309 - added behaviour bean for qshare:shared aspect and integration test
2017-07-20 11:48:10 +03:00
Tom Page
a473316d3d
Merge branch 'merge-2.5/MNT-18083_SearchPerformance' into 'release/V2.5'
...
Merge 2.5/mnt 18083 search performance
See merge request !373
2017-07-19 08:39:44 +01:00
Tuna Aksoy
402ea0ca9a
RM-5345: Fixed review comments (cherry picked from commit f86440b)
...
RM-5346: Null pointers should not be dereferenced (cherry picked from commit 8130305
2017-07-10 16:47:44 +01:00
Tuna Aksoy
5cfc0b3b1b
Merge branch 'feature-2.5/RM-5359_integration_test' into merge/RM25_20170709
...
# Conflicts:
# rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/query/org.hibernate.dialect.Dialect/rm-authorities-SqlMap.xml
# rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/query/org.hibernate.dialect.Dialect/rm-common-SqlMap.xml
2017-07-09 18:41:25 +01:00
Tuna Aksoy
3c822e95cb
RM-5359 (An admin user can't declare as record a secured file)
2017-06-30 17:22:38 +01:00
Tuna Aksoy
1ce62e0434
Merge branch 'feature/RM-5345_Fix_security_issues' into 'master'
...
Feature/rm 5345 fix security issues
See merge request !374
2017-06-30 15:45:29 +01:00
Tuna Aksoy
f86440be72
RM-5345: Fixed review comments
2017-06-28 16:03:38 +01:00
Tuna Aksoy
6ad0698360
Merge branch 'release/V2.5' into merge/RM_25_2017_07_28
2017-06-28 14:36:45 +01:00
Tuna Aksoy
0ff080f305
RM-5347: Resources should be closed
2017-06-27 16:52:51 +01:00
Tuna Aksoy
813030506e
RM-5346: Null pointers should not be dereferenced
2017-06-27 16:35:51 +01:00
Tom Page
9e750f7f2b
MNT-18083 Merge release/V2.5.0.x into release/V2.5.
2017-06-27 16:24:40 +01:00
Sara Aspery
29517c366c
final change after review - replace logger method
2017-06-27 15:12:22 +01:00
Sara Aspery
cbabf8e545
updated serialId in new RecordMissingMetadataException
2017-06-27 12:48:59 +01:00
rwetherall
db19519dc7
Use the bean id in the cache key to prevent actions and identifiers clashing
2017-06-27 21:42:08 +10:00
rwetherall
fcab3c3bdf
Fix BaseEvaluator cache. Name missing from key.
2017-06-27 16:11:25 +10:00
rwetherall
d030ede377
Transaction cache on BaseEvaluator.evaluate method
2017-06-27 13:13:25 +10:00
Sara Aspery
7269b33c65
changes following review
2017-06-26 12:41:02 +01:00
rwetherall
90cd720c42
Search browse performance improvements
...
(cherry picked from commit 089df63e27b03efbfb97c369faad80c8e8c9885c)
2017-06-26 07:47:50 +01:00
Sara Aspery
fb215876b8
fixing IDE whitespaces
2017-06-24 22:49:27 +01:00
Sara Aspery
80434ce57e
Merge branch 'master' of git.alfresco.com:records-management/records-management into RM-4431_CompleteRecordActionRestAPI
2017-06-23 16:40:00 +01:00
Sara Aspery
1400d3f657
tidied up REST tests
2017-06-23 11:54:40 +01:00
Silviu Dinuta
5dd5d27867
RM-5033: used aspect rma:ghosted to exclude destroyed records with kept
...
metadata
2017-06-23 13:01:40 +03:00
Silviu Dinuta
6349f27056
RM-5033: excluded destroyed records with metadata from search query
2017-06-22 11:43:08 +03:00
Tuna Aksoy
fe44da1abe
Merge branch 'feature-2.5/RM-5309_SharedFilesCannotBeClasified' into merge/20170620_RM25
...
Conflicts:
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java
2017-06-20 16:07:26 +01:00
Sara Aspery
6b3c140bdd
correct message for Share
2017-06-20 15:48:25 +01:00
Sara Aspery
214f593680
refactor complete record Rest API
2017-06-20 13:58:19 +01:00
Ramona Popa
5e906d878c
RM-5309 - typo
2017-06-20 14:34:47 +03:00
Ramona Popa
8214f6d23e
RM-5309 - fix after review
2017-06-20 14:33:28 +03:00
Sara Aspery
57b3460b58
include_declare_record_refactoring_in_Rest
2017-06-20 11:12:22 +01:00
Sara Aspery
15b1bc41cd
Revert "Merge branch 'feature/refactor_declare_record_action' into RM-4431_CompleteRecordActionRestAPI"
...
This reverts commit 6ff917958875b35cdcd7
2017-06-20 08:27:09 +01:00
Sara Aspery
6ff9179588
Merge branch 'feature/refactor_declare_record_action' into RM-4431_CompleteRecordActionRestAPI
2017-06-19 18:56:53 +01:00
Sara Aspery
29a057adeb
more_declare_record_refactoring
2017-06-19 18:06:34 +01:00
Ramona Popa
37d1b200a2
RM-5309 - Remove shared link if exists when a record is declared
2017-06-16 18:44:14 +03:00
Sara Aspery
95a406cb30
updated from master
2017-06-15 11:04:23 +01:00
Tuna Aksoy
21c881593a
Move the code for completing a record from DeclareRecordAction to RecordServiceImpl
2017-06-14 19:38:45 +01:00
Sara Aspery
28356584c1
Merge branch 'master' of git.alfresco.com:records-management/records-management into RM-4431_CompleteRecordActionRestAPI
2017-06-14 13:05:53 +01:00
Tuna Aksoy
f479000e61
Merge branch 'feature-2.5/RM-5175_Complete_record_missing_metadata' into 'release/V2.5'
...
Feature 2.5/rm 5175 complete record missing metadata
See merge request !324
2017-06-12 21:42:17 +01:00
Tuna Aksoy
64892424b2
Merge branch 'feature-2.5/RM-4689_Can_delete_RM_site_content_in_browser' into merge/RM_25
...
Conflicts:
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/BaseBehaviourBean.java
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/FilePlanType.java
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/HoldContainerType.java
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/TransferContainerType.java
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/TransferType.java
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/UnfiledRecordContainerType.java
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4293Test.java
rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/TransferContainerTypeUnitTest.java
2017-06-12 21:03:15 +01:00
Tuna Aksoy
f4cdbf12e1
Merge branch 'feature-2.5/RM-5175_Complete_record_missing_metadata' into merge/RM_25
...
Conflicts:
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
2017-06-12 20:42:51 +01:00
Sara Aspery
09e3766230
RM-5175_Complete_record_with_missing_metadata changes after review
2017-06-12 16:42:05 +01:00
Tuna Aksoy
06a48d73cd
Merged release/V2.5 and addressed review comments
2017-06-12 16:41:30 +01:00
Tuna Aksoy
1712bac995
RM-4689 (Can delete all RM site content through Repository browser)
...
Manually backported following changes:
RM-4293
734c1b2a82a4aac053a8c6ca74ab26
2017-06-12 16:17:24 +01:00
Sara Aspery
d98d3e9c69
RM-5175_Complete_record_with_missing_metadata
2017-06-10 23:50:15 +01:00
Sara Aspery
11f9c6c3e7
RM-5175_Complete_record_with_missing_metadata
2017-06-06 16:49:56 +01:00
Sara Aspery
a7fddef34b
RM-5175_Complete_record_with_missing_metadata
2017-06-06 16:21:49 +01:00
Sara Aspery
e579b51cf9
Merge branch 'master' of git.alfresco.com:records-management/records-management into RM-4431_CompleteRecordActionRestAPI
2017-06-01 14:42:02 +01:00
