Changeset 0c37625 for src/main/java/it/finki/charitable/controller

Timestamp:

10/07/21 20:22:23 (3 years ago)

Author:

NikolaCenevski <cenevskinikola@…>

Branches:

master

Children:

ee0e297

Parents:

276a8b6

Message:

Moderator pagination

Location:

src/main/java/it/finki/charitable/controller

Files:

• DonationPostController.java (modified) (2 diffs)
• ModeratorController.java (modified) (3 diffs)

src/main/java/it/finki/charitable/controller/DonationPostController.java

@@ -127 +127 @@
                         @RequestParam String sort,
                         @RequestParam(required = false,defaultValue = "") String order) {
-        Page<DonationPost> postList = donationPostService.findPaginated(page,6, sort, order);
+        Page<DonationPost> postList = donationPostService.findPaginated(page,6, sort, order, true);
         if (postList.getSize() == 0) {
             model.addAttribute("noPosts", true);
@@ -204 +204 @@
         reasonService.save(reason);
         reportPost.getReasons().add(reason);
+        reportPost.setNumReports(reportPost.getNumReports() + 1);
         reportPostService.save(reportPost);
         return String.format("redirect:/post?postid=%d", postid);

src/main/java/it/finki/charitable/controller/ModeratorController.java

@@ -6 +6 @@
 import it.finki.charitable.services.ReasonService;
 import it.finki.charitable.services.ReportPostService;
+import org.springframework.data.domain.Page;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
@@ -33 +34 @@
 
     @RequestMapping("moderator/approval")
-    public String approval(Model model) {
-        List<DonationPost> postList = donationPostService.findAllByApproved(false);
-        if (postList.size() == 0) {
+    public String approval(Model model,
+                           @RequestParam int page,
+                           @RequestParam String sort,
+                           @RequestParam(required = false,defaultValue = "") String order) {
+        Page<DonationPost> postList = donationPostService.findPaginated(page, 6, sort, order, false);
+        if (postList.getSize() == 0) {
             model.addAttribute("noPosts", true);
             return "postApproval";
         }
+        model.addAttribute("totalPages", postList.getTotalPages());
         model.addAttribute("postList", postList);
         return "postApproval";
@@ -92 +97 @@
 
     @RequestMapping("/moderator/report")
-    public String reportedPosts(Model model) {
-        List<ReportPost> postList = reportPostService.findAll();
-        if (postList.size() == 0) {
+    public String reportedPosts(Model model,
+                                @RequestParam int page,
+                                @RequestParam String sort,
+                                @RequestParam(required = false,defaultValue = "") String order) {
+        Page<ReportPost> postList = reportPostService.findAll(page, 6, sort, order);
+        if (postList.getSize() == 0) {
             model.addAttribute("noPosts", true);
             return "reportedPosts";