## 2.3.31

* fixed #311 User Selfservice is broken
* Issue #312 User2UserMessage Chat is broken
* fixed #313 Change Password - update HTML Layout to current Bootstrap Version
* fixed #314 Set Default Language - update HTML Layout to current Bootstrap Version
* fixed #315 Add Context - update HTML Layout to current Bootstrap Version
* fixed #316 Add Context - add Back Button
* Issue #317 switch Context is broken
* Issue #318 Broken: http://localhost:8080/taskstate/task/1153/changeorderto/1051

Author: thomaswoehlke

.idea/compiler.xml

@@ -31,7 +31,7 @@
 @RequestMapping(path = "/user2user")
 public class User2UserMessageController extends AbstractController {
 
-    @RequestMapping(path = "/{userId}/messages", method = RequestMethod.GET)
+    @RequestMapping(path = "/{userId}/messages/", method = RequestMethod.GET)
     public final String getLastMessagesBetweenCurrentAndOtherUser(
             @PathVariable("userId") UserAccount otherUser,
             @PageableDefault(sort = "rowCreatedAt", direction = Sort.Direction.DESC) Pageable request,
@@ -55,7 +55,7 @@ public final String getLastMessagesBetweenCurrentAndOtherUser(
         return "user/messages/all";
     }
 
-    @RequestMapping(path = "/{userId}/", method = RequestMethod.POST)
+    @RequestMapping(path = "/{userId}/messages/", method = RequestMethod.POST)
     public final String sendNewMessageToOtherUser(
             @PathVariable("userId") UserAccount otherUser,
             @Valid @ModelAttribute("newUser2UserMessage") User2UserMessageFormBean user2UserMessageFormBean,
@@ -84,7 +84,7 @@ public final String sendNewMessageToOtherUser(
         } else {
             user2UserMessageService.sendNewUserMessage(thisUser, otherUser, user2UserMessageFormBean);
             model.addAttribute("userSession", userSession);
-            return "redirect:/user/messages/" + otherUser.getId();
+            return "redirect:/user2user/" + otherUser.getId() + "/messages/";
         }
     }
 

src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageController.java

@@ -15,6 +15,7 @@
 import org.woehlke.simpleworklist.user.services.User2UserMessageService;
 
 import java.util.List;
+import java.util.UUID;
 
 /**
  * Created by tw on 16.02.2016.
@@ -43,6 +44,7 @@ public User2UserMessage sendNewUserMessage(
         m.setSender(thisUser);
         m.setReceiver(otherUser);
         m.setReadByReceiver(false);
+        m.setUuid(UUID.randomUUID().toString());
         m.setMessageText(user2UserMessageFormBean.getMessageText());
         return userMessageRepository.saveAndFlush(m);
     }

src/main/java/org/woehlke/simpleworklist/user/services/User2UserMessageServiceImpl.java

@@ -22,7 +22,8 @@ <h1>
         <div th:each="m : ${user2UserMessagePage}">
             <div class="row">
                 <div class="col">
-                    <div class="alert alert-info" role="alert" th:style="${m.sender.id == otherUser.id ? 'width: 66%; float:right' : 'width: 66%; float:left'}">
+                    <div class="alert alert-info" role="alert"
+                         th:style="${m.sender.id == otherUser.id ? 'width: 66%; float:right' : 'width: 66%; float:left'}">
                         <span th:text="${m.messageText}" ></span>
                         <span style="float:right">
                             <small>
@@ -37,19 +38,20 @@ <h1>
         <div class="row" id="newUser2UserMessageForm">
             <div class="col">
                 <div class="card card-body">
-                    <form id="formId" th:action="@{/user2user/{userId}/messages/(userId=${otherUser.id})}" th:object="${user2UserMessageFormBean}" method="post">
-                        <div class="form-group form-control-lg">
+                    <form id="formId" th:action="@{/user2user/{userId}/messages/(userId=${otherUser.id})}"
+                          th:object="${newUser2UserMessage}" method="post">
+                        <div class="form-group">
                             <label for="textEditor" class="control-label">
                                 <span th:utext="#{pages.user2UserMessages.newMessage}">New Message:</span>
                             </label>
                             <textarea id="textEditor" rows="3" cols="50"
-                                      th:field="*{messageText}" class="form-control" />
+                                      th:field="*{messageText}" class="form-control form-control-lg" />
                             <div>
                                 <div th:each="err : ${#fields.errors('messageText')}"
                                      th:text="${err}" class="invalid-feedback" />
                             </div>
                         </div>
-                        <div class="form-group form-control-lg">
+                        <div class="form-group">
                         </div>
                         <button id="newUserMessageButton" type="submit" class="btn btn-primary">
                             <i class="fas fa-envelope"></i>
@@ -66,9 +68,13 @@ <h1>
         </div>
     </div>
 
-    <script th:src="@{/webjars/ckeditor/4.11.3/full/ckeditor.js}"></script>
+    <script th:src="@{/webjars/ckeditor/18.0.0/inline/ckeditor.js}"></script>
     <script th:inline="javascript">
-        CKEDITOR.replace( 'textEditor' );
+        InlineEditor
+            .create( document.querySelector( '#textEditor' ) )
+            .catch( error => {
+                console.error( error );
+            } );
     </script>
 </body>
 </html>