From 943345ab785d1ac326aea14517e219140b74e4bd Mon Sep 17 00:00:00 2001 From: Ross Gale Date: Thu, 25 Apr 2019 14:10:12 +0100 Subject: [PATCH 1/3] RM-6834 adding fix for system edited records not being returned from search --- .../script/slingshot/RMSearchGet.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java index 4b5f18819f..1323e1fefb 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java @@ -77,6 +77,7 @@ public class RMSearchGet extends DeclarativeWebScript private static final String PARAM_SORTBY = "sortby"; private static final String PARAM_FILTERS = "filters"; private static final String PARAM_MAX_ITEMS = "maxitems"; + private static final String SYSTEM = "System"; /** Records management search service */ protected RecordsManagementSearchService recordsManagementSearchService; @@ -373,6 +374,12 @@ public class RMSearchGet extends DeclarativeWebScript private String getDisplayName(String userName) { + //Fix for RM-6834 + if(userName.equals(SYSTEM)) + { + return SYSTEM; + } + String result = personDataCache.get(userName); if (result == null) { From f07dd878bfe31ad72d685c59222b0663fa9fa01b Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Tue, 30 Apr 2019 11:32:08 +0100 Subject: [PATCH 2/3] [maven-release-plugin] prepare release V3.0.1 --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 63fd617e4b..a96adb5841 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 3.0.1-SNAPSHOT + 3.0.1 Alfresco Records Management http://www.alfresco.org/ @@ -18,7 +18,7 @@ scm:git:https://git.alfresco.com/records-management/records-management.git scm:git:https://git.alfresco.com/records-management/records-management.git https://git.alfresco.com/records-management/records-management - HEAD + V3.0.1 diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index cb31a8d65c..3779d303be 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 3.0.1-SNAPSHOT + 3.0.1 diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index 3d41833de5..e0dfaf88d6 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-automation - 3.0.1-SNAPSHOT + 3.0.1 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 3e62076dda..3b9029a259 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 3.0.1-SNAPSHOT + 3.0.1 diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 3baff3828d..0deb21c82c 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 3.0.1-SNAPSHOT + 3.0.1 diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index df887493cf..2b7a4e3120 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-rm-community - 3.0.1-SNAPSHOT + 3.0.1 From ff84a1ae37442495e403c6fda213d66624d40d6b Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Tue, 30 Apr 2019 11:32:13 +0100 Subject: [PATCH 3/3] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index a96adb5841..3ff2e1b1f0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 3.0.1 + 3.0.2-SNAPSHOT Alfresco Records Management http://www.alfresco.org/ @@ -18,7 +18,7 @@ scm:git:https://git.alfresco.com/records-management/records-management.git scm:git:https://git.alfresco.com/records-management/records-management.git https://git.alfresco.com/records-management/records-management - V3.0.1 + HEAD diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 3779d303be..f3819b4891 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 3.0.1 + 3.0.2-SNAPSHOT diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index e0dfaf88d6..d45d244d80 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-automation - 3.0.1 + 3.0.2-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 3b9029a259..935a202542 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 3.0.1 + 3.0.2-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 0deb21c82c..76bbb7602f 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 3.0.1 + 3.0.2-SNAPSHOT diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index 2b7a4e3120..ff7981e582 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-rm-community - 3.0.1 + 3.0.2-SNAPSHOT