Skip to content

Commit 78d71f8

Browse files
committed
work in progres
1 parent bd81988 commit 78d71f8

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ public class Project extends AuditModel implements Serializable, ComparableById<
8383
private String name;
8484

8585
//@SafeHtml(whitelistType= SafeHtml.WhiteListType.RELAXED)
86-
@NotBlank
8786
@Length(min = 0, max = 65535)
8887
@Column(name = "description", nullable = true, length = 65535, columnDefinition = "text")
8988
private String description;

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

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,18 +80,22 @@ public final String addNewTopLevelProjectSave(
8080
@ModelAttribute("userSession") UserSessionBean userSession,
8181
BindingResult result,
8282
Locale locale, Model model
83-
){
83+
) {
8484
log.info("/project/root/add/project (POST)");
8585
Context context = super.getContext(userSession);
86-
return projectControllerService.addNewProjectToRootPersist(
87-
userSession,
88-
project,
89-
context,
90-
result,
91-
locale,
92-
model,
93-
"redirect:/project/"
94-
);
86+
if (result.hasErrors()) {
87+
return "project/root/add/project";
88+
} else {
89+
return projectControllerService.addNewProjectToRootPersist(
90+
userSession,
91+
project,
92+
context,
93+
result,
94+
locale,
95+
model,
96+
"redirect:/project/"
97+
);
98+
}
9599
}
96100

97101
@RequestMapping(path = "/root/add/task", method = RequestMethod.GET)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,6 @@ public String transformTaskIntoProjectGet(Task task) {
184184
log.info("tried to transform Task " + task.getId() + " to new Project " + projectId);
185185
return thisProject.getUrl();
186186
}
187-
return "redirect:/taskstate/inbox";
187+
return "redirect:/project/root";
188188
}
189189
}

0 commit comments

Comments
 (0)