Index: docs/versioning/er_models/ER_BUILD_BOARD_v3.xml =================================================================== --- docs/versioning/er_models/ER_BUILD_BOARD_v3.xml (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ docs/versioning/er_models/ER_BUILD_BOARD_v3.xml (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -1,1 +1,1 @@ -

RECIEVESPROJECT_THREAD

IS_MODERATED_BYStarted_atTHREADtrue16dTOPIC_THREADUSER

33DEVELOPER

true16oPROJECT_OWNER

PERMISSIONSDEFINED_BY

NDOUBLE3CUSTOM_ROLE

3MDOUBLE3VALID_IN

3NDOUBLE3HAS

DOUBLE3CHANNEL

3NCONSTRUCTS

3N

IS_CREATED_BY

3N

MODERATOR

3trueNametruetrueName

Password

Content

ASSOCIATED_WITH

NRegister_at

3trueName

SENDS_MESSAGE_IN

NContent

Started_at

Sent_at

TAGCREATES

ASSISGNED_TO

NtruetrueName

Description

LIKES

NIs_active

3NSexDescription

SUBBMITTED_BYSUBMISSION3M

ABOUTREPORT3N

FOR_MISCONDUCTtruetrueId

PROJECT_REQUEST3NStatus

Description

ReasonIS_ASSIGNED

M

PDISCUSSION_THREADTitle

Title

P

3NRepo_url

DOUBLE3BLACKLISTED_USERDOUBLE3BLACKLISTED_BY

DOUBLE3REFERS_TO

DOUBLE3BLACKLISTED_FROM

3N3trueStart_dateEnd_date

3N

3N

QtruetrueId

DOUBLE3FEEDBACKDescriptionSubmission_typeCreated_atWRITTEN_BY

truetrueId

DOUBLE3SUBBMITED_FOR

3

DOUBLE3Guidelines

Created_at

Created_atEmail

Name

Uername

true16d

33

3N

3M

IS_PARENT_TO

M

IS_PART_OF

3N

3M

3N

3M +

RECIEVESPROJECT_THREAD

IS_MODERATED_BYStarted_atTHREADtrue16dTOPIC_THREADUSER

33DEVELOPER

true16oPROJECT_OWNER

PERMISSIONSDEFINED_BY

NDOUBLE3CUSTOM_ROLE

3MDOUBLE3VALID_IN

3NDOUBLE3HAS

DOUBLE3CHANNEL

3NCONSTRUCTS

3N

IS_CREATED_BY

3N

MODERATOR

3trueNametruetrueName

Password

Content

ASSOCIATED_WITH

NRegister_at

3trueName

SENDS_MESSAGE_IN

NContent

Started_at

Sent_at

TAGCREATES

ASSISGNED_TO

NtruetrueName

Description

LIKES

NIs_active

3NSexDescription

SUBBMITTED_BYSUBMISSION3M

ABOUTREPORT3N

FOR_MISCONDUCTtruetrueId

PROJECT_REQUEST3NStatus

Description

ReasonIS_ASSIGNED

M

PDISCUSSION_THREADTitle

Title

P

3NRepo_url

DOUBLE3BLACKLISTED_USERDOUBLE3BLACKLISTED_BY

DOUBLE3REFERS_TO

DOUBLE3BLACKLISTED_FROM

3N3trueStart_dateEnd_date

3N

3N

QtruetrueId

DOUBLE3FEEDBACKDescriptionSubmission_typeCreated_atWRITTEN_BY

truetrueId

DOUBLE3SUBBMITED_FOR

3

DOUBLE3Guidelines

Created_at

Created_atEmail

Name

Uername

true16d

33

3N

3M

EMBDEDABLE_THREADPARENT

M

PARENT

3N

true16d

3M

3N

3M

33 Index: src/main/java/com/db/finki/www/build_board/controller/ExceptionHandler.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/ExceptionHandler.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/controller/ExceptionHandler.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -3,5 +3,4 @@ import org.springframework.security.access.AccessDeniedException; import org.springframework.web.bind.annotation.ControllerAdvice; -import org.springframework.web.client.HttpServerErrorException; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.resource.NoResourceFoundException; @@ -34,9 +33,9 @@ - @org.springframework.web.bind.annotation.ExceptionHandler(value = {Exception.class }) - public ModelAndView handleNotFound(Exception exception) { - System.out.println(exception.getMessage()); - exception.printStackTrace(); - return mavBuilder(exception,"An error occurred.",-1); - } + // @org.springframework.web.bind.annotation.ExceptionHandler(value = {Exception.class }) + // public ModelAndView handleNotFound(Exception exception) { + // System.out.println(exception.getMessage()); + // exception.printStackTrace(); + // return mavBuilder(exception,"An error occurred.",-1); + // } } Index: src/main/java/com/db/finki/www/build_board/controller/thread_controller/DiscussionController.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/thread_controller/DiscussionController.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/controller/thread_controller/DiscussionController.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -22,7 +22,7 @@ } - @PostMapping("/topics/{topic-name}/discussions/add") + @PostMapping("/topics/{topic-id}/discussions/add") public String addReply( - @PathVariable(name = "topic-name") String topicName, + @PathVariable(name = "topic-id") String topicId, @RequestParam int parentId, @RequestParam String content, Model model, @SessionAttribute @P("user") BBUser user) { @@ -33,20 +33,20 @@ } - return "redirect:/topics/" + topicName; + return "redirect:/topics/" + topicId; } - @PreAuthorize("@discussionService.discussionById(#replyId).user.username==#username") - @PostMapping("/topics/{topic-name}/discussions/{replyId}/edit") - public String editReply(@PathVariable(name = "topic-name") String topicName, @PathVariable @P("replyId") int replyId, @RequestParam String content, Model model, HttpSession session + @PreAuthorize("@discussionService.getDiscussionById(#replyId).user.username==#username") + @PostMapping("/topics/{topic-id}/discussions/{replyId}/edit") + public String editReply(@PathVariable(name = "topic-id") String topicId, @PathVariable @P("replyId") int replyId, @RequestParam String content, Model model, HttpSession session , @P("username") String username) { discussionService.edit(replyId, content); - return "redirect:/topics/" + topicName; + return "redirect:/topics/" + topicId; } - @PreAuthorize("@discussionService.discussionById(#discussionId).getUser().getId()==#user.getId()") - @PostMapping("/topics/{topic-name}/discussions/{discussionId}/delete") - public String deleteDiscussion(@PathVariable(name = "topic-name") String topicName, @PathVariable @P("discussionId") int discussionId, @SessionAttribute @P("user") BBUser user, @RequestParam @Param("username") String username) { + @PreAuthorize("@discussionService.getDiscussionById(#discussionId).getUser().getId()==#user.getId()") + @PostMapping("/topics/{topic-id}/discussions/{discussionId}/delete") + public String deleteDiscussion(@PathVariable(name = "topic-id") String topicId, @PathVariable @P("discussionId") int discussionId, @SessionAttribute @P("user") BBUser user, @RequestParam @Param("username") String username) { discussionService.delete(discussionId); - return "redirect:/topics/" + topicName; + return "redirect:/topics/" + topicId; } Index: src/main/java/com/db/finki/www/build_board/controller/thread_controller/ProjectController.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/thread_controller/ProjectController.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/controller/thread_controller/ProjectController.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -21,4 +21,5 @@ private final ProjectService projectService; private final TagService tagService; + private final String DUPLICATED_TITLE_MSG="could not execute statement [ERROR: duplicate key value violates unique constraint"; public ProjectController(ProjectService projectService, TagServiceImpl topicService) { @@ -28,11 +29,16 @@ @GetMapping("/{title}") - public String getProjectPage(@PathVariable(name = "title") Project project, Model model, RedirectAttributes redirectAttributes) { + public String getProjectPage(@PathVariable(name = "title") Project project, Model model, RedirectAttributes redirectAttributes, + @RequestParam(required = false) String duplicateTitle) { model.addAttribute("project", project); model.addAttribute("tags", tagService.getAll()); model.addAttribute("developers",projectService.getAllDevelopersForProject(project)); String error = (String) redirectAttributes.getAttribute("error"); + if(error != null){ model.addAttribute("error", error); + } + if(duplicateTitle!=null){ + model.addAttribute("errMsg","There already exists a project with the provided title" ); } @@ -43,5 +49,8 @@ @GetMapping("/create") - public String getCreateProjectPage(Model model) { + public String getCreateProjectPage(Model model, @RequestParam(required = false) String duplicateTitle) { + if(duplicateTitle!=null){ + model.addAttribute("errMsg", "There already exists a project with the provided title"); + } model.addAttribute("project", new Project()); model.addAttribute("isCreatingProject", tagService.getAll()); @@ -78,4 +87,5 @@ return "project_pages/members"; } + @PreAuthorize("#project.getUser().equals(#user)") @PostMapping("/{pr-title}/members/{mem-id}/kick") @@ -92,7 +102,17 @@ @RequestParam(name = "repo_url") String repoUrl, @RequestParam @P("username") String username, - @RequestParam String description + @RequestParam String description, + RedirectAttributes attributes ){ - return "redirect:/projects/" + projectService.update(project, repoUrl, description, newTitle).getTitle(); + String oldTitle = project.getTitle(); + try{ + return "redirect:/projects/" + projectService.update(project, repoUrl, description, newTitle).getTitle(); + }catch(org.springframework.dao.DataIntegrityViolationException e){ + if(e.getMessage().contains(DUPLICATED_TITLE_MSG)){ + attributes.addAttribute("duplicateTitle", "y"); + return "redirect:/projects/" + oldTitle; + } + throw e ; + } } @@ -102,8 +122,17 @@ @RequestParam(required = false, name = "repo_url") String repoUrl, @RequestParam(required = false) String description, - @SessionAttribute BBUser user + @SessionAttribute BBUser user, + RedirectAttributes redirectAttributes ) { - projectService.create(title,repoUrl,description,user); - return "redirect:/"; + try{ + projectService.create(title,repoUrl,description,user); + return "redirect:/"; + }catch(org.springframework.dao.DataIntegrityViolationException e){ + if(e.getMessage().contains(DUPLICATED_TITLE_MSG)){ + redirectAttributes.addAttribute("duplicateTitle", "y"); + return "redirect:/projects/create"; + } + throw e ; + } } @@ -114,7 +143,8 @@ @RequestParam(name = "title") String topicsTitle, @RequestParam String description, - @RequestParam @P("username") String username + @RequestParam @P("username") String username, + @SessionAttribute("user") BBUser user ){ - projectService.createTopic(project, topicsTitle, description, username); + projectService.createTopic(project, topicsTitle, description, user); return "redirect:/projects/" + project.getTitle(); } Index: src/main/java/com/db/finki/www/build_board/controller/thread_controller/TagController.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/thread_controller/TagController.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/controller/thread_controller/TagController.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -35,11 +35,12 @@ @RequestParam String tagName, @P("username") String username, - Model model + Model model, + @SessionAttribute("user") BBUser user ) { Topic t = topicService.getById(id); - topicService.addTagToTopic(t, tagName); + topicService.addTagToTopic(t, tagName,user); model.addAttribute("topic", t); model.addAttribute("tags", tagService.getAllNotUsed(t)); - return "redirect:/topics/" + t.getTitle(); + return "redirect:/topics/" + t.getId(); } @@ -50,5 +51,5 @@ model.addAttribute("topic", t); model.addAttribute("tags", tagService.getAllNotUsed(t)); - return "redirect:/topics/" + t.getTitle(); + return "redirect:/topics/" + t.getId(); } Index: src/main/java/com/db/finki/www/build_board/controller/thread_controller/TopicController.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/thread_controller/TopicController.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/controller/thread_controller/TopicController.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -12,5 +12,5 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; - +import org.springframework.web.servlet.mvc.support.RedirectAttributes; @Controller @@ -21,4 +21,5 @@ private final TagService tagService; private final DiscussionService discussionService; + private final String DUPLICATE_TITTLE = "There already exists a topic with title"; public TopicController(TopicService topicService, TagService tagService, DiscussionService discussionService) { @@ -29,11 +30,17 @@ @GetMapping("/create") - public String getCreateTopicPage() { + public String getCreateTopicPage(Model model, @RequestParam(required = false) Boolean duplicateTittle) { + if (duplicateTittle != null) + model.addAttribute("errMsg", "There already exists a thread with the same title in that parent"); return "create-topic"; } - @GetMapping("/{topic-name}") - public String showTopic(@PathVariable(name = "topic-name") String topicName, Model model) { - Topic t = topicService.getByTitle(topicName); + @GetMapping("/{topic-id}") + public String showTopic(@PathVariable(name = "topic-id") int topicId, Model model, + @RequestParam(required = false) Boolean duplicateTittle) { + if (duplicateTittle != null) { + model.addAttribute("errMsg", "There already exists a thread with the same title in that parent"); + } + Topic t = topicService.getById((long)topicId); model.addAttribute("topic", t); model.addAttribute("tags", tagService.getAllNotUsed(t)); @@ -43,13 +50,20 @@ @PostMapping("/add") - public String createTopic(@RequestParam String title, @RequestParam String description, HttpSession session) { - BBUser user = (BBUser) session.getAttribute("user"); - topicService.create(title, description, user); - return "redirect:/"; + public String createTopic(@RequestParam String title, @RequestParam String description, HttpSession session, + RedirectAttributes reddAttributes) { + try { + title = title.strip(); + BBUser user = (BBUser) session.getAttribute("user"); + topicService.create(title, description, user); + return "redirect:/"; + } catch (org.springframework.orm.jpa.JpaSystemException e) { + return handleDuplicatedTitle(e, reddAttributes, "/topics/create"); + } } @PreAuthorize("@topicServiceImpl.getById(#id).getUser().getUsername().equals(#username)") @PostMapping("/{id}/delete") - public String deleteTopic(@PathVariable(name = "id") @P("id") long id, HttpSession session, @RequestParam @P("username") String username) { + public String deleteTopic(@PathVariable(name = "id") @P("id") long id, HttpSession session, + @RequestParam @P("username") String username) { topicService.deleteTopicById(id); return "redirect:/"; @@ -58,11 +72,27 @@ @PreAuthorize("@topicServiceImpl.getById(#id).getUser().getUsername().equals(#username)") @PostMapping("/{id}/edit") - public String editTopic(@PathVariable @P("id") long id, @RequestParam String title, @RequestParam String content, Model model, @RequestParam @P("username")String username) { - Topic t = topicService.create(id, title, content); - model.addAttribute("topic", t); - model.addAttribute("tags", tagService.getAllNotUsed(t)); - return "redirect:/topics/" + t.getTitle(); + public String editTopic(@PathVariable @P("id") long id, @RequestParam String title, @RequestParam String content, + Model model, @RequestParam @P("username") String username, RedirectAttributes redirectAttributes) { + Topic t = topicService.getById(id); + String oldTitle = t.getTitle(); + try { + title = title.strip(); + topicService.edit(t, title, content); + model.addAttribute("topic", t); + model.addAttribute("tags", tagService.getAllNotUsed(t)); + return "redirect:/topics/" + t.getId(); + } catch (org.springframework.orm.jpa.JpaSystemException e) { + return handleDuplicatedTitle(e, redirectAttributes, "/topics/" + oldTitle); + } } + public String handleDuplicatedTitle(org.springframework.orm.jpa.JpaSystemException e, + RedirectAttributes attr, String redirectPath) { + if (e.getMessage().contains(DUPLICATE_TITTLE)) { + attr.addAttribute("duplicateTittle", true); + return "redirect:" + redirectPath; + } + throw e; + } } Index: src/main/java/com/db/finki/www/build_board/controller/util/LikesController.java =================================================================== --- src/main/java/com/db/finki/www/build_board/controller/util/LikesController.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/controller/util/LikesController.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -4,4 +4,5 @@ import com.db.finki.www.build_board.entity.thread.Project; import com.db.finki.www.build_board.entity.thread.Topic; +import com.db.finki.www.build_board.entity.thread.discussion_thread.Discussion; import com.db.finki.www.build_board.entity.user_type.BBUser; import com.db.finki.www.build_board.service.util.ThreadService; @@ -22,16 +23,12 @@ private BBThread rate(int threadId, BBUser user, boolean likes) { - return threadService.rate(threadId,user.getId(),likes ); + return threadService.rate(threadId, user.getId(), likes); } - private String getUrlForThraed(BBThread thread, String topicName){ - if(topicName!=null) - return "redirect:/topics/" + topicName; + private String getUrlForThraed(BBThread thread, Integer id) { + if (id != null) + return "redirect:/topics/" + id; - if(thread instanceof Topic topic){ - return "redirect:/topics/" + topic.getTitle(); - }else{ - return "redirect:/projects/" + ((Project)thread).getTitle(); - } + return "redirect:/projects/" + ((Project) thread).getTitle(); } @@ -39,14 +36,14 @@ public String dislikeThread(@SessionAttribute BBUser user, @PathVariable(name = "thread-id") int threadId, - @RequestParam(required = false,name = "topic-name") String topicName + @RequestParam(required = false, name = "topic-id") Integer topicId ) { - return getUrlForThraed(rate(threadId,user,false),topicName); + return getUrlForThraed(rate(threadId, user, false), topicId); } @PostMapping("/threads/{thread-id}/like") public String likeThread(@SessionAttribute BBUser user, - @RequestParam(required = false,name = "topic-name") String topicName, + @RequestParam(required = false, name = "topic-id") Integer topicId, @PathVariable(name = "thread-id") int threadId) { - return getUrlForThraed(rate(threadId,user,true),topicName); + return getUrlForThraed(rate(threadId, user, true), topicId); } Index: src/main/java/com/db/finki/www/build_board/entity/channel/Channel.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/channel/Channel.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/entity/channel/Channel.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -21,4 +21,5 @@ @Id private String name; + @Id @ManyToOne Index: src/main/java/com/db/finki/www/build_board/entity/request/ProjectRequests.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/request/ProjectRequests.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/entity/request/ProjectRequests.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -28,8 +28,3 @@ setCreatedAt(LocalDateTime.now()); } - - public Feedback getFeedback() { - Feedback feedback = getFeedback(); - return feedback == null ? null : feedback; - } } Index: src/main/java/com/db/finki/www/build_board/entity/thread/BBThread.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/thread/BBThread.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/entity/thread/BBThread.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -43,5 +43,5 @@ protected Set likes = new HashSet<>(); - private LocalDateTime createdAt; + private LocalDateTime createdAt = LocalDateTime.now(); public int getNumLikes(){ Index: src/main/java/com/db/finki/www/build_board/entity/thread/EmbdedableThread.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/thread/EmbdedableThread.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) +++ src/main/java/com/db/finki/www/build_board/entity/thread/EmbdedableThread.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -0,0 +1,20 @@ +package com.db.finki.www.build_board.entity.thread; + +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@EqualsAndHashCode(callSuper = false) +@Entity +@Table(name = "embdedable_thread") +public class EmbdedableThread extends BBThread { + @Id + Integer id ; +} Index: src/main/java/com/db/finki/www/build_board/entity/thread/Project.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/thread/Project.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/entity/thread/Project.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -46,5 +46,7 @@ @OneToMany(mappedBy = "project") private Set requests = new HashSet<>(); + @OneToMany(mappedBy = "project") + @OrderBy("name") private Set channels; Index: src/main/java/com/db/finki/www/build_board/entity/thread/Topic.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/thread/Topic.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/entity/thread/Topic.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -14,5 +14,5 @@ @Entity @Table(name = "topic_thread") -public class Topic extends BBThread implements NamedThread { +public class Topic extends EmbdedableThread implements NamedThread { private String title; @@ -24,7 +24,9 @@ @ManyToOne @JoinColumn(name = "parent_id") - private BBThread parent; + private Project parent; @Override - public String getTypeName() {return "topics";} + public String getTypeName() { + return "topics"; + } } Index: src/main/java/com/db/finki/www/build_board/entity/thread/discussion_thread/Discussion.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/thread/discussion_thread/Discussion.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/entity/thread/discussion_thread/Discussion.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -2,4 +2,5 @@ import com.db.finki.www.build_board.entity.thread.BBThread; +import com.db.finki.www.build_board.entity.thread.EmbdedableThread; import jakarta.persistence.*; import lombok.Getter; @@ -10,7 +11,7 @@ @Getter @Setter -public class Discussion extends BBThread { +public class Discussion extends EmbdedableThread { @ManyToOne @JoinColumn(name = "parent_id") - private BBThread parent; + private EmbdedableThread parent; } Index: src/main/java/com/db/finki/www/build_board/entity/thread/discussion_thread/VDiscussion.java =================================================================== --- src/main/java/com/db/finki/www/build_board/entity/thread/discussion_thread/VDiscussion.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/entity/thread/discussion_thread/VDiscussion.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -10,7 +10,8 @@ import org.hibernate.annotations.Immutable; +import java.util.ArrayList; +import java.util.List; import java.time.LocalDateTime; -//TODO: napraj da izlegvat preku created_at @Entity @Immutable @@ -43,3 +44,6 @@ private LocalDateTime createdAt; + + @Transient + private List children = new ArrayList<>(); } Index: src/main/java/com/db/finki/www/build_board/repository/thread/DiscussionRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/thread/DiscussionRepository.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/repository/thread/DiscussionRepository.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -3,8 +3,19 @@ import com.db.finki.www.build_board.entity.thread.discussion_thread.Discussion; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; @Repository -public interface DiscussionRepository extends JpaRepository { +public interface DiscussionRepository extends JpaRepository { Discussion findDiscussionById(int discussionId); + + @Modifying + @Query( + value = """ + delete from discussion_thread dt where id=:id + """, nativeQuery = true + ) + void deleteById(@Param("id") long discussionId); } Index: src/main/java/com/db/finki/www/build_board/repository/thread/EmbdedableRepo.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/thread/EmbdedableRepo.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) +++ src/main/java/com/db/finki/www/build_board/repository/thread/EmbdedableRepo.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -0,0 +1,9 @@ +package com.db.finki.www.build_board.repository.thread; + +import com.db.finki.www.build_board.entity.thread.EmbdedableThread; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface EmbdedableRepo extends JpaRepository { +} Index: src/main/java/com/db/finki/www/build_board/repository/thread/ProjectRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/thread/ProjectRepository.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/repository/thread/ProjectRepository.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -12,5 +12,5 @@ @Repository public interface ProjectRepository extends JpaRepository, JpaSpecificationExecutor { - Project findByTitleStartingWith(String title); + Project findByTitle(String title); void deleteByTitle(String title); List findAllByUserId(int userId); Index: src/main/java/com/db/finki/www/build_board/repository/thread/TagRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/thread/TagRepository.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/repository/thread/TagRepository.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -10,3 +10,4 @@ public interface TagRepository extends JpaRepository { Optional findByName(String name); + long deleteAllByName(String name); } Index: src/main/java/com/db/finki/www/build_board/repository/thread/TopicRepository.java =================================================================== --- src/main/java/com/db/finki/www/build_board/repository/thread/TopicRepository.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/repository/thread/TopicRepository.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -4,4 +4,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; @@ -11,4 +14,12 @@ Topic findByTitle(String title); void deleteByTitle(String title); - Topic findById(long id);; + Topic findById(long id); + + @Modifying + @Query(value=""" + delete from topic_thread where id=:id + """, + nativeQuery = true + ) + void deleteById(@Param("id") Long id); } Index: src/main/java/com/db/finki/www/build_board/service/search/FilterMap.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/search/FilterMap.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/service/search/FilterMap.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -19,5 +19,5 @@ return (root, query, cb) -> null; } else { - return (root, query, cb) -> cb.like(cb.lower(root.get("title")), "%" + param.toLowerCase() + "%"); + return (root, query, cb) -> cb.like(cb.lower(root.get("title")), param.toLowerCase() + "%" ); } }); Index: src/main/java/com/db/finki/www/build_board/service/thread/impl/DiscussionService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/thread/impl/DiscussionService.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/service/thread/impl/DiscussionService.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -2,4 +2,5 @@ import com.db.finki.www.build_board.entity.thread.BBThread; +import com.db.finki.www.build_board.entity.thread.EmbdedableThread; import com.db.finki.www.build_board.entity.thread.discussion_thread.Discussion; import com.db.finki.www.build_board.entity.thread.discussion_thread.VDiscussion; @@ -7,7 +8,10 @@ import com.db.finki.www.build_board.repository.thread.BBThreadRepository; import com.db.finki.www.build_board.repository.thread.DiscussionRepository; +import com.db.finki.www.build_board.repository.thread.EmbdedableRepo; import com.db.finki.www.build_board.repository.thread.VDiscussRepo; import jakarta.transaction.Transactional; import org.springframework.stereotype.Service; + +import java.util.ArrayList; import java.util.List; @@ -16,14 +20,26 @@ private final VDiscussRepo vDiscussRepo; private final DiscussionRepository discussionRepository; - private final BBThreadRepository threadRepository; + private final EmbdedableRepo embdedableRepo; - public DiscussionService(VDiscussRepo vDiscussRepo, DiscussionRepository discussionRepository, BBThreadRepository threadRepository) { + public DiscussionService(VDiscussRepo vDiscussRepo, DiscussionRepository discussionRepository, EmbdedableRepo embdedableRepo) { this.vDiscussRepo = vDiscussRepo; this.discussionRepository = discussionRepository; - this.threadRepository = threadRepository; + this.embdedableRepo = embdedableRepo; } public List getByTopic(int topicId){ - return vDiscussRepo.findVDiscussionByParentTopicIdOrderByCreatedAtDesc(topicId); + List discussions = vDiscussRepo.findVDiscussionByParentTopicIdOrderByCreatedAtDesc(topicId); + List level0Discussions = new ArrayList<>(); + + for(VDiscussion dis : discussions){ + if(dis.getDepth()==0){ + level0Discussions.add(dis); + }else{ + VDiscussion parent = vDiscussRepo.findById((long) dis.getDiscussion().getParent().getId()).get(); + parent.getChildren().add(dis); + } + } + + return level0Discussions; } @@ -42,5 +58,5 @@ public Discussion create(String content, int parentId, BBUser user){ - BBThread parent = threadRepository.findById(parentId); + EmbdedableThread parent = embdedableRepo.findById((long) parentId).get(); Discussion reply = new Discussion(); @@ -59,6 +75,6 @@ public void delete(int threadId) { - Discussion d = discussionRepository.findDiscussionById(threadId); - discussionRepository.delete(d); + discussionRepository.deleteById((long) threadId); } + } Index: src/main/java/com/db/finki/www/build_board/service/thread/impl/ProjectService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/thread/impl/ProjectService.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/service/thread/impl/ProjectService.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -37,4 +37,5 @@ public void create(String title, String repoUrl, String description, BBUser user) { + title=title.strip(); projectRepository.save( new Project(title, repoUrl, description, user) @@ -43,12 +44,13 @@ public Project getByTitle(String title) { - return projectRepository.findByTitleStartingWith(title); + return projectRepository.findByTitle(title); } - public void createTopic(Project project, String title, String description, String username) { - BBUser user = ((BBUser) userDetailsService.loadUserByUsername(username)); - Topic topic = topicService.create(title, description, user); - topic.setParent(project); + public void createTopic(Project project, String title, String description, BBUser user) { + title=title.strip(); + Topic topic = topicService.create(title, description, user, project); + project.getTopics().add(topic); + projectRepository.save(project); } @@ -78,4 +80,5 @@ public Project update(Project project, String repoUrl, String description, String newTitle) { + newTitle=newTitle.strip(); project.setRepoUrl(repoUrl); project.setDescription(description); Index: src/main/java/com/db/finki/www/build_board/service/thread/impl/TopicServiceImpl.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/thread/impl/TopicServiceImpl.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/service/thread/impl/TopicServiceImpl.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -1,5 +1,7 @@ package com.db.finki.www.build_board.service.thread.impl; +import com.db.finki.www.build_board.entity.thread.Project; import com.db.finki.www.build_board.entity.user_type.BBUser; +import com.db.finki.www.build_board.entity.thread.BBThread; import com.db.finki.www.build_board.entity.thread.Tag; import com.db.finki.www.build_board.entity.thread.Topic; @@ -26,7 +28,20 @@ public Topic create(String title, String description, BBUser user) { Topic topic = new Topic(); + topic.setTitle(title); topic.setContent(description); topic.setUser(user); + + return topicRepository.save(topic); + } + + public Topic create(String title, String description, BBUser user, Project parent){ + Topic topic = new Topic(); + + topic.setTitle(title); + topic.setContent(description); + topic.setUser(user); + topic.setParent(parent); + return topicRepository.save(topic); } @@ -59,5 +74,5 @@ @Override @Transactional - public void addTagToTopic(Topic topic, String tagName) { + public void addTagToTopic(Topic topic, String tagName, BBUser user) { tagRepository.findByName(tagName).ifPresentOrElse(tag -> { topic.getTags().add(tag); @@ -66,5 +81,5 @@ tagRepository.save(tag); },() -> { - Tag tag = new Tag(tagName); + Tag tag = new Tag(tagName,user); tagRepository.save(tag); topic.getTags().add(tag); @@ -75,6 +90,5 @@ @Override - public Topic create(long id, String title, String description) { - Topic t = getById(id); + public Topic edit(Topic t, String title, String description) { t.setTitle(title); t.setContent(description); @@ -86,5 +100,5 @@ public Topic deleteTagFromTopic(long id, String tagName) { Topic t = getById(id); - boolean removed = t.getTags().remove(new Tag(tagName)); + boolean removed = t.getTags().removeIf(tag -> tag.getName().equals(tagName)); if(!removed) throw new IllegalArgumentException("Tag not found"); return topicRepository.save(t); Index: src/main/java/com/db/finki/www/build_board/service/thread/itf/TopicService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/thread/itf/TopicService.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/service/thread/itf/TopicService.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -1,5 +1,7 @@ package com.db.finki.www.build_board.service.thread.itf; +import com.db.finki.www.build_board.entity.thread.Project; import com.db.finki.www.build_board.entity.user_type.BBUser; +import com.db.finki.www.build_board.entity.thread.BBThread; import com.db.finki.www.build_board.entity.thread.Topic; @@ -7,4 +9,5 @@ public interface TopicService { Topic create(String title, String description, BBUser user); + Topic create(String title, String description, BBUser user, Project parent); List getAll(); Topic getByTitle(String title); @@ -12,6 +15,6 @@ void deleteTopicByTitle(String title); Topic getById(Long id); - void addTagToTopic(Topic topic, String tagName); - Topic create(long id, String title, String description); + void addTagToTopic(Topic topic, String tagName, BBUser user); + Topic edit(Topic t, String title, String description); Topic deleteTagFromTopic(long id, String tagName); } Index: src/main/java/com/db/finki/www/build_board/service/user/BBUserDetailsService.java =================================================================== --- src/main/java/com/db/finki/www/build_board/service/user/BBUserDetailsService.java (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/java/com/db/finki/www/build_board/service/user/BBUserDetailsService.java (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -29,4 +29,9 @@ public BBUser changeInfoForUserWithUsername(String oldUsername, String newUsername, String email, String name, String description, String password) { + oldUsername=oldUsername.strip(); + newUsername=newUsername.strip(); + email=email.strip(); + password=password.strip(); + BBUser user = (BBUser) loadUserByUsername(oldUsername); Index: src/main/resources/application.properties =================================================================== --- src/main/resources/application.properties (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/resources/application.properties (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -11,3 +11,6 @@ avatar.upload-dir=/uploads/user-avatars + +logging.level.org.hibernate.SQL=DEBUG +logging.level.org.hibernate.orm.jdbc.bind=TRACE logging.level.org.springframework.security=DEBUG Index: src/main/resources/db/migration/V1__init_ddl.sql =================================================================== --- src/main/resources/db/migration/V1__init_ddl.sql (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/resources/db/migration/V1__init_ddl.sql (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -77,9 +77,19 @@ user_id INT REFERENCES users (id) NOT NULL --IS_CREATED_BY TOTAL ); +CREATE TABLE project_thread +( + title VARCHAR(256) UNIQUE NOT NULL, + repo_url TEXT, + id INT PRIMARY KEY REFERENCES thread (id) on delete cascade --INHERITANCE +); +create table embdedable_thread( + id int primary key references thread(id) on delete cascade +); + CREATE TABLE topic_thread ( title VARCHAR(256) NOT NULL, id INT PRIMARY KEY REFERENCES thread(id) on delete cascade, --INHERITANCE - parent_id int REFERENCES thread(id) on delete CASCADE --PARENT + parent_id int REFERENCES project_thread(id) on delete CASCADE --PARENT ); create table topic_guidelines @@ -93,12 +103,7 @@ ( id INT PRIMARY KEY REFERENCES thread(id) on delete cascade, --INHERITANCE, - parent_id int REFERENCES thread(id) on delete CASCADE NOT NULL --PARENT TOTAL BIGINT -); -CREATE TABLE project_thread -( - title VARCHAR(256) UNIQUE NOT NULL, - repo_url TEXT, - id INT PRIMARY KEY REFERENCES thread (id) on delete cascade --INHERITANCE -); + parent_id int REFERENCES embdedable_thread(id) NOT NULL --on delete CASCADE ne tuku preku trigger PARENT TOTAL BIGINT +); + CREATE TABLE likes ( @@ -329,5 +334,9 @@ FROM v_project_thread p WHERE NEW.id = p.id; - IF not check_if_user_exists_in('developer_associated_with_project', 'developer_id', usrId::text) THEN + IF not EXISTS( + select 1 + from developer_associated_with_project dawp + where dawp.project_id=new_project_id and dawp.developer_id=usrId + ) THEN INSERT INTO developer_associated_with_project(project_id, developer_id, started_at) values (new_project_id, usrId, NOW()); @@ -414,17 +423,37 @@ DELETE FROM moderator where id=OLD.user_id; END IF; - IF not exists ( - select 1 - from topic_threads_moderators t - where t.thread_id = OLD.thread_id - ) + IF not exists ( + select 1 + from topic_threads_moderators t + where t.thread_id = OLD.thread_id + ) THEN + delete from discussion_thread where parent_id=OLD.thread_id; DELETE FROM topic_thread where id = OLD.thread_id; - delete from thread where id = OLD.thread_id; - END IF; +-- delete from thread where id = OLD.thread_id; + END IF; RETURN OLD; END; $function$ ; +create or replace function fn_aa_rm_orphan_dics() + returns trigger + language plpgsql +as +$$ +BEGIN +-- RAISE NOTICE '%',OLD.id; + + delete from discussion_thread dt + where dt.parent_id=OLD.id; + delete from embdedable_thread + where id = OLD.id; + delete from thread t + where t.id=OLD.id; + RETURN OLD; +END; +$$; + + -- create or replace function fn_remove_thread() @@ -487,4 +516,16 @@ for each row execute function fn_insert_general_for_project(); + +create or replace trigger tr_rm_orphan_disc + after delete + on discussion_thread + for each row +execute function fn_aa_rm_orphan_dics(); + +create or replace trigger tr_rm_orphan_disc + after delete + on topic_thread + for each row +execute function fn_aa_rm_orphan_dics(); -- create or replace trigger tr_remove_thread_from_project Index: src/main/resources/db/migration/V2__add_test_data.sql =================================================================== --- src/main/resources/db/migration/V2__add_test_data.sql (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/resources/db/migration/V2__add_test_data.sql (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -11,36 +11,28 @@ INSERT INTO thread (content, user_id) VALUES - ('Main content for topic thread 1', 1), - ('Main content for topic thread 2', 2), - ('Discussion content for topic 1', 1), - ('Discussion content for topic 2', 2), - ('Project-specific thread content', 3), - ('Reply to topic 1', 4), - ('Further discussion on topic 2', 5), - ('Main content for topic thread', 1), - ('Main content for topic thread', 2), - ('Discussion content for topic 1', 1), - ('Discussion content for topic 2', 2), - ('Project-specific thread content', 3), - ('Reply to topic 1', 4), - ('Further discussion on topic 2', 5), - ('Further discussion on topic 2', 5), - ('Main content for topic thread', 1), - ('Main content for topic thread', 2), - ('Discussion content for topic 1', 1), - ('Discussion content for topic 2', 2), - ('Project-specific thread content', 3), - ('Reply to topic 1', 4), - ('Further discussion on topic 2', 5); + ('Main content for topic thread 1', 1), --1 + ('Main content for topic thread 2', 2), --2 + ('Discussion content for topic 1', 1), --3 + ('Discussion content for topic 2', 2), --4 + ('Project-specific thread content', 3), --5 + ('Reply to topic 1', 4), -- 6 + ('Further discussion on topic 2', 5), --7 + ('Main content for topic thread', 1), --8 + ('Project-specific thread content 2', 5); --9 +insert into embdedable_thread(id) +values (1),(2),(3),(4),(6),(7),(8); + + +INSERT INTO project_thread (id, title, repo_url) +VALUES + (5, 'Project 1 Thread', 'http://github.com/project1'), + (9, 'Project 2 Thread', 'http://github.com/project1'); INSERT INTO topic_thread (id, title, parent_id) VALUES (1, 'Topic 1' , 5), - (2, 'Topic 2', 5), - (8, 'Topic 7' , NULL), - (9, 'Topic 8', NULL), - (16, 'Topic 9' , NULL), - (17, 'Topic 10', NULL); + (2, 'Topic 2', NULL), + (8, 'Topic 7' , NULL); insert into topic_guidelines(topic_id,description) @@ -53,12 +45,7 @@ (3, 1), (4, 2), - (6, 3), + (6, 1), (7, 4); -INSERT INTO project_thread (id, title, repo_url) -VALUES - (5, 'Project 1 Thread', 'http://github.com/project1'), - (10, 'Project 2 Thread', 'http://github.com/project1'), - (15, 'Project 3 Thread', 'http://github.com/project1'); INSERT INTO likes (user_id, thread_id) @@ -90,6 +77,5 @@ VALUES (3, 5, 'Admin'), - (5, 5, 'Developer'), - (1, 5, 'Developer'); + (5, 5, 'Developer'); INSERT INTO project_roles_permissions (permission_name, role_name, project_id) @@ -98,8 +84,8 @@ ('Delete Thread', 'Admin', 5); -insert into submission(created_by,status,description) -values -(1,'PENDING','Inappropriate content'), -(3,'DENIED','Spam content'); +insert into submission(created_by,status,description) +values + (1,'PENDING','Inappropriate content'), + (3,'DENIED','Spam content'); INSERT INTO report (id,thread_id, for_user_id) @@ -117,2 +103,11 @@ (NOW(), 'Resen ladno a?', 3, 5, 'Updates'); + + + + + + + + + Index: src/main/resources/templates/create-topic.html =================================================================== --- src/main/resources/templates/create-topic.html (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/resources/templates/create-topic.html (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -6,4 +6,15 @@ Add Topic + @@ -30,4 +41,10 @@ +

+
+
Error
+

+
+
Index: src/main/resources/templates/fragments/discussion.html =================================================================== --- src/main/resources/templates/fragments/discussion.html (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) +++ src/main/resources/templates/fragments/discussion.html (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -0,0 +1,115 @@ + +
+
+
+ Profile Picture + Reply Author + + + + + + +
+
+ +
+ +
+ +
+
+ + + +
+
+
+
+ + +
+
+

Reply content goes here.

+
+
+
+ + + + + + +
+ +
+ + +
+
+
+ + +
+
+ + +
+
+
+ +
+
+
+ + + +
+
+
+ + +
+
+ + +
+ +
+
+
+
+
+
+ Index: src/main/resources/templates/home_pages/home.html =================================================================== --- src/main/resources/templates/home_pages/home.html (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/resources/templates/home_pages/home.html (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -158,5 +158,5 @@
-
Index: src/main/resources/templates/project_pages/members.html =================================================================== --- src/main/resources/templates/project_pages/members.html (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/resources/templates/project_pages/members.html (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -45,5 +45,4 @@
-
Index: src/main/resources/templates/project_pages/project-create.html =================================================================== --- src/main/resources/templates/project_pages/project-create.html (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/resources/templates/project_pages/project-create.html (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -6,8 +6,24 @@ Add project +
- +
+
+
Error
+

+
+
Index: src/main/resources/templates/project_pages/requests/show-user-requests.html =================================================================== --- src/main/resources/templates/project_pages/requests/show-user-requests.html (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/resources/templates/project_pages/requests/show-user-requests.html (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -11,5 +11,5 @@
-
Index: src/main/resources/templates/project_pages/show-project.html =================================================================== --- src/main/resources/templates/project_pages/show-project.html (revision 7ee81b2a1116aa3b44018c37f28e9c23488dbef9) +++ src/main/resources/templates/project_pages/show-project.html (revision 6eae161ca2c615c6f1ca6f751ff293c0ad80b18f) @@ -6,7 +6,24 @@ +
+
+
+
Error
+

+
+
-
@@ -115,5 +132,4 @@
- - -
- -
- - - - - -
-
-
- - -
-
-

Reply content goes here.

-
-
-
- - - - - - -
- -
- - -
-
-
- - -
-
- - -
-
-
- -
-
-
- - - -
-
-
- - -
-
- - -
- -
-
-
-
-
+
@@ -253,5 +159,5 @@
- +