Index: Prototype Application/Paw5/src/main/java/finki/paw5/web/controllers/PostController.java =================================================================== --- Prototype Application/Paw5/src/main/java/finki/paw5/web/controllers/PostController.java (revision 9358bff26b421a85a750ccfad4a8e763090ed873) +++ Prototype Application/Paw5/src/main/java/finki/paw5/web/controllers/PostController.java (revision 5f531141d857c1ba3c779edac277960e0a2e95ca) @@ -77,12 +77,10 @@ @GetMapping("/adoption-posts") - public String getAdoptionPosts(Model model, HttpServletRequest request){ + public String getAdoptionPosts(Model model){ List posts = this.postService.findAll(); List pets = this.petService.listpets(); - //model.addAttribute("posts", posts); - //model.addAttribute("pets",pets); - request.getSession().setAttribute("posts",posts);//temp - request.getSession().setAttribute("pets",pets);//temp + model.addAttribute("posts", posts); + model.addAttribute("pets",pets); return "list-posts-adoption"; @@ -90,19 +88,12 @@ @GetMapping("/pet-details-{id}") - public String getPostDetails(@PathVariable Integer id, Model model, HttpServletRequest request){ + public String getPostDetails(@PathVariable Integer id, + Model model){ Post post = this.postService.findById(id).get(); Pet pet = this.petService.findById(post.getPetId()); - //model.addAttribute("pet", pet); - //model.addAttribute("post", post); - request.getSession().setAttribute("post", post);//temp - request.getSession().setAttribute("pet", pet);//temp - - if(pet.getAdoptionId() != null){ - request.getSession().setAttribute("disableAdoption", true); - } else{ - request.getSession().setAttribute("disableAdoption", false); - } + model.addAttribute("pet", pet); + model.addAttribute("post", post); return "pet-details"; Index: Prototype Application/Paw5/src/main/resources/templates/list-posts-adoption.html =================================================================== --- Prototype Application/Paw5/src/main/resources/templates/list-posts-adoption.html (revision 9358bff26b421a85a750ccfad4a8e763090ed873) +++ Prototype Application/Paw5/src/main/resources/templates/list-posts-adoption.html (revision 5f531141d857c1ba3c779edac277960e0a2e95ca) @@ -1,5 +1,5 @@ @@ -45,8 +45,8 @@ Species - + - - + +
@@ -41,34 +41,36 @@ Post ID - + Pet Name - + Species - + Breed - + Gender - + Age Group - + Size - + - + th:action="@{'/submit-adopton-{id}' (id=${pet.getId()})}" + th:if="${pet.getAdoptionId()==null}"> +