Fixed #103, Fixed #102

Author: thomaswoehlke

src/main/java/org/woehlke/simpleworklist/project/ProjectController.java

@@ -51,6 +51,7 @@ public final String showRootProject(
             @RequestParam(required = false) boolean isDeleted,
             @ModelAttribute("userSession") UserSessionBean userSession,
             Locale locale, Model model) {
+        log.info("/project/root");
         Context context = super.getContext(userSession);
         userSession.setLastProjectId(0L);
         model.addAttribute("userSession",userSession);
@@ -74,6 +75,7 @@ public final String showProject(
             @RequestParam(required = false) boolean isDeleted,
             @ModelAttribute("userSession") UserSessionBean userSession,
             Locale locale, Model model) {
+        log.info("/project/"+projectId);
         Context context = super.getContext(userSession);
         userSession.setLastProjectId(projectId);
         model.addAttribute("userSession",userSession);
@@ -105,6 +107,7 @@ public final String addNewTopLevelProjectForm(
             @ModelAttribute("userSession") UserSessionBean userSession,
             Locale locale, Model model
     ){
+        log.info("/project/add/new/project (GET)");
         return addNewProject(rootProjectId, userSession, locale, model);
     }
 
@@ -116,6 +119,7 @@ public final String addNewTopLevelProjectSave(
         BindingResult result,
         Locale locale, Model model
     ){
+        log.info("/project/add/new/project (POST)");
         return addNewProjectPersist( rootProjectId, userSession, project, result, locale, model );
     }
 
@@ -245,6 +249,7 @@ private final String addNewProject(
         Locale locale,
         Model model
     ) {
+        log.info("private addNewProject projectId="+projectId);
         Context context = super.getContext(userSession);
         UserAccount userAccount = context.getUserAccount();
         userSession.setLastProjectId(projectId);
@@ -273,12 +278,13 @@ private final String addNewProject(
     }
 
     private String addNewProjectPersist(
-        @PathVariable long projectId,
-        @ModelAttribute("userSession") UserSessionBean userSession,
-        @Valid Project project,
+        long projectId,
+        UserSessionBean userSession,
+        Project project,
         BindingResult result,
         Locale locale, Model model
     ){
+        log.info("private addNewProjectPersist projectId="+projectId+" "+project.toString());
         Context context = super.getContext(userSession);
         UserAccount userAccount = context.getUserAccount();
         userSession.setLastProjectId(projectId);
@@ -324,6 +330,7 @@ public final String addNewProjectGet(
             @ModelAttribute("userSession") UserSessionBean userSession,
             Locale locale, Model model
     ) {
+        log.info("private addNewProjectGet (GET) projectId="+projectId);
         return addNewProject(projectId, userSession, locale, model);
     }
 
@@ -335,6 +342,7 @@ public final String addNewProjectPost(
             @Valid Project project,
             BindingResult result,
             Locale locale, Model model) {
+        log.info("private addNewProjectPost (POST) projectId="+projectId+" "+project.toString());
         return addNewProjectPersist( projectId, userSession, project, result, locale, model );
     }
 

src/main/resources/templates/project/add.html

@@ -49,13 +49,13 @@ <h1>
 				<div th:each="err : ${#fields.errors('context.id')}" th:text="${err}" class="alert alert-danger"></div>
 			</div>
 		</div>
-        <input type="hidden"
-               name="${_csrf.parameterName}"
-               value="${_csrf.token}"/>
 		<button id="createNewProject" type="submit" class="btn btn-primary">
 			<i class="fas fa-save"></i>
 			<span th:utext="#{project.add.button}">Add Project</span>
 		</button>
+        <input type="hidden"
+               name="${_csrf.parameterName}"
+               value="${_csrf.token}"/>
 	</form>
 	</div>
 	<!-- Document Window End -->

src/main/resources/templates/project/edit.html

@@ -53,14 +53,14 @@ <h1>
 					</div>
 				</div>
 			</div>
-            <input type="hidden"
-                   name="${_csrf.parameterName}"
-                   value="${_csrf.token}"/>
 			<input type="hidden" th:field="*{id}" />
 			<button id="saveEditedProject" type="submit" class="btn btn-primary">
 				<i class="fas fa-save"></i>
 				<span th:utext="#{project.edit.button}">Save Project</span>
 			</button>
+            <input type="hidden"
+                   name="${_csrf.parameterName}"
+                   value="${_csrf.token}"/>
 		</form>
 	</div>
 	<!-- Document Window End -->