diff --git a/app/src/main/java/it/chalmers/gamma/adapter/primary/web/GroupsController.java b/app/src/main/java/it/chalmers/gamma/adapter/primary/web/GroupsController.java index ecbe57a18..becfb78bf 100644 --- a/app/src/main/java/it/chalmers/gamma/adapter/primary/web/GroupsController.java +++ b/app/src/main/java/it/chalmers/gamma/adapter/primary/web/GroupsController.java @@ -70,7 +70,7 @@ public ModelAndView getGroups( return mv; } - public record Member(String name, String post, UUID userId) {} + public record Member(String name, String post, UUID postId, UUID userId) {} public static class MyMembershipsForm { @@ -118,13 +118,17 @@ public ModelAndView getGroup( group.get().groupMembers().stream() .map( groupMember -> { - String post = " - " + groupMember.post().enName(); + String post = groupMember.post().enName(); if (groupMember.unofficialPostName() != null) { post += " - " + groupMember.unofficialPostName(); } - return new Member(groupMember.user().nick(), post, groupMember.user().id()); + return new Member( + groupMember.user().nick(), + post, + groupMember.post().id(), + groupMember.user().id()); }) .toList()); mv.addObject("random", Math.random()); @@ -199,6 +203,7 @@ public ModelAndView getCancelEditGroup( + groupMember.post().enName() + " - " + Objects.requireNonNullElse(groupMember.unofficialPostName(), ""), + groupMember.post().id(), groupMember.user().id())) .toList()); diff --git a/app/src/main/java/it/chalmers/gamma/adapter/primary/web/PostsController.java b/app/src/main/java/it/chalmers/gamma/adapter/primary/web/PostsController.java index baa6733cd..ab0d415e2 100644 --- a/app/src/main/java/it/chalmers/gamma/adapter/primary/web/PostsController.java +++ b/app/src/main/java/it/chalmers/gamma/adapter/primary/web/PostsController.java @@ -9,11 +9,10 @@ import it.chalmers.gamma.app.group.domain.EmailPrefix; import it.chalmers.gamma.app.post.PostFacade; import it.chalmers.gamma.app.post.domain.PostRepository; -import java.util.*; - import it.chalmers.gamma.app.validation.ValidationResult; import it.chalmers.gamma.app.validation.Validator; import jakarta.servlet.http.HttpServletResponse; +import java.util.*; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; @@ -128,7 +127,12 @@ private ModelAndView createGetEditPost( ModelAndView mv = new ModelAndView(); if (form == null) { - form = new UpdatePost(post.get().svName(), post.get().enName(), post.get().emailPrefix(), post.get().version()); + form = + new UpdatePost( + post.get().svName(), + post.get().enName(), + post.get().emailPrefix(), + post.get().version()); } if (bindingResult != null) { @@ -210,7 +214,6 @@ public static final class NameValidator implements Validator { @Override public ValidationResult validate(String value) { return withValidators(IS_NOT_EMPTY, SANITIZED_HTML, MAX_LENGTH.apply(2048)).validate(value); - } } diff --git a/app/src/main/resources/templates/client-details/page.html b/app/src/main/resources/templates/client-details/page.html index 5a74b3982..01d41d81f 100644 --- a/app/src/main/resources/templates/client-details/page.html +++ b/app/src/main/resources/templates/client-details/page.html @@ -98,7 +98,9 @@ No users have approved this client yet

diff --git a/app/src/main/resources/templates/group-details/page.html b/app/src/main/resources/templates/group-details/page.html index 858b2822f..bf80986e4 100644 --- a/app/src/main/resources/templates/group-details/page.html +++ b/app/src/main/resources/templates/group-details/page.html @@ -26,8 +26,9 @@