Skip to content
Snippets Groups Projects
Commit ead9e014 authored by Jochem de Goede's avatar Jochem de Goede
Browse files

Set Request comment to empty if not submitted; Redirect messages for Room edit/create/delete

parent 6e0fcf1e
No related branches found
No related tags found
No related merge requests found
......@@ -68,8 +68,9 @@ public class AdminController {
}
@RequestMapping(value = "/admin/rooms", method = RequestMethod.POST)
public String createRoom(Model model, @Valid Room room) {
public String createRoom(Model model, @Valid Room room, RedirectAttributes redirectAttributes) {
roomRepository.save(room);
redirectAttributes.addFlashAttribute("message", "Room has been created.");
return "redirect:/admin/rooms";
}
......@@ -84,7 +85,7 @@ public class AdminController {
@RequestMapping(value = "/admin/room/edit/{id}", method = RequestMethod.POST)
public String saveRoom(@PathVariable("id") Long id,
@RequestParam("map") MultipartFile map,
Room room) throws IOException {
Room room, RedirectAttributes redirectAttributes) throws IOException {
Room objRoom = roomRepository.findOne(id);
objRoom.setName(room.getName());
objRoom.setPlaceholder(room.isPlaceholder());
......@@ -93,13 +94,17 @@ public class AdminController {
objRoom.setMapFilePath(filePath);
}
roomRepository.save(objRoom);
redirectAttributes.addFlashAttribute("message", "Room has been saved.");
return "redirect:/admin/rooms";
}
@RequestMapping(value = "/admin/room/delete", method = RequestMethod.POST)
public String deleteRoom(Model model, @RequestParam(value = "id") Long id) {
public String deleteRoom(Model model,
@RequestParam(value = "id") Long id,
RedirectAttributes redirectAttributes) {
Room objRoom = roomRepository.findOne(id);
roomRepository.delete(objRoom);
redirectAttributes.addFlashAttribute("message", "Room has been deleted.");
return "redirect:/admin/rooms";
}
}
......@@ -308,6 +308,8 @@ public class RequestController {
Room room = roomRepository.findOne(roomId);
if (comment != null) {
request.setComment(comment);
} else {
request.setComment("");
}
request.setRoom(room);
requestRepository.save(request);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment