Merge branch 'master' into 24842-remove-lodash-from-core-web

dotCMS · Aug 26, 2024 · 38afe35 · 38afe35
2 parents d0ab826 + 9b9d57b
commit 38afe35
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/workflow/WorkflowResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/workflow/WorkflowResource.java
@@ -2537,12 +2537,16 @@ private void mergeContentletsByDefaultAction(final List<SingleContentQuery> cont
                 new DotConcurrentFactory.SubmitterConfigBuilder().poolSize(2).maxPoolSize(5).queueCapacity(CONTENTLETS_LIMIT).build());
         final CompletionService<Map<String, Object>> completionService = new ExecutorCompletionService<>(dotSubmitter);
         final List<Future<Map<String, Object>>> futures = new ArrayList<>();
+        // todo: add the mock request
+        final HttpServletRequest statelessRequest = RequestUtil.INSTANCE.createStatelessRequest(request);
+
 
         for (final SingleContentQuery singleContentQuery : contentletsToMergeList) {
 
             // this triggers the merges
             final Future<Map<String, Object>> future = completionService.submit(() -> {
 
+                HttpServletRequestThreadLocal.INSTANCE.setRequest(statelessRequest);
                 final Map<String, Object> resultMap = new HashMap<>();
                 final String inode      = singleContentQuery.getInode();
                 final String identifier = singleContentQuery.getIdentifier();
@@ -2552,7 +2556,7 @@ private void mergeContentletsByDefaultAction(final List<SingleContentQuery> cont
 
                 try {
 
-                    fireTransactionalAction(systemAction, fireActionForm, request, mode,
+                    fireTransactionalAction(systemAction, fireActionForm, statelessRequest, mode,
                             initDataObject, resultMap, inode, identifier, languageId, user, indexPolicy);
                 } catch (Exception e) {
 

diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/user/ajax/UserAjax.java b/dotCMS/src/main/java/com/dotmarketing/portlets/user/ajax/UserAjax.java
@@ -202,7 +202,7 @@ public Map<String, Object> addUser(String userId, String firstName, String lastN
 			if (localTransaction) {
 				HibernateUtil.rollbackTransaction();
 			}
-			throw new DotDataException(LanguageUtil.get(uWebAPI.getLoggedInUser(request),"User-Info-Save-Failed : " + e.getMessage()),"User-Info-Save-Failed",e);
+			throw new DotDataException(LanguageUtil.get(uWebAPI.getLoggedInUser(request), e.getMessage()),"User-Info-Save-Failed",e);
 
 		}
 
@@ -312,7 +312,7 @@ public Map<String, Object> updateUser(String userId, String newUserID, String fi
 		} catch(DotDataException | DotStateException e) {
 			ActivityLogger.logInfo(getClass(), "Error Updating User", "Date: " + date + ";  "+ "User:" + modUser.getUserId());
 			AdminLogger.log(getClass(), "Error Updating User", "Date: " + date + ";  "+ "User:" + modUser.getUserId());
-			throw new DotDataException(LanguageUtil.get(uWebAPI.getLoggedInUser(request),"User-Info-Save-Failed " + e.getMessage()),"User-Info-Save-Failed",e);
+			throw new DotDataException(LanguageUtil.get(uWebAPI.getLoggedInUser(request), e.getMessage()),"User-Info-Save-Failed",e);
 
 		}
 

diff --git a/dotCMS/src/main/webapp/WEB-INF/messages/Language.properties b/dotCMS/src/main/webapp/WEB-INF/messages/Language.properties
@@ -4739,7 +4739,7 @@ user-id=User ID
 User-Info-Save-Failed=User Information Save Failed
 User-Info-Save-First-Name-Failed=First Name not valid
 User-Info-Save-Last-Name-Failed=Last Name not valid
-User-Info-Save-Password-Failed=The password does not meet the system security requirements. It must contain at least 8 characters and no white spaces.
+User-Info-Save-Password-Failed=Your password must be at least 8 characters long and include at least one special character from the list  # % + : = ? @ It must not contain spaces.
 User-Info-Save-Password-Recycle-Failed=The password has been already used lately and cannot be reused yet.
 user-info-saved=User info saved
 User-Info-Saved=User Information Saved