Changeset 194776a

Timestamp:

09/03/21 18:34:05 (3 years ago)

Author:

KostaFortumanov <kfortumanov@…>

Branches:

master

Children:

5306751

Parents:

f8007b3

Message:

Mali promeni vo azuriranje sredstva

Location:

src/main

Files:

• java/it/finki/charitable/controller/DonationPostController.java (modified) (1 diff)
• java/it/finki/charitable/controller/UserProfileController.java (modified) (2 diffs)
• resources/templates/myProfile.html (modified) (3 diffs)

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

@@ -172 +172 @@
 
         DonationPost post = donationPostService.getById(postid);
-        FundsCollected funds = new FundsCollected("online", amount);
+        FundsCollected funds = new FundsCollected("Online donation", amount);
         fundsCollectedService.save(funds);
 

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

@@ -105 +105 @@
     }
 
-    @RequestMapping("/addFunds")
+    @RequestMapping(value = "/addFunds", method = RequestMethod.POST)
     public String addFunds(@RequestParam Long postid,
                            @RequestParam String type,
@@ -111 +111 @@
 
         DonationPost post = donationPostService.getById(postid);
-        FundsCollected funds = new FundsCollected(type, amount);
-        fundsCollectedService.save(funds);
-
-        post.getFundsCollected().add(funds);
-        donationPostService.save(post);
+        if(post.getUser().getUsername().equals(SecurityContextHolder.getContext().getAuthentication().getName())) {
+            FundsCollected funds = new FundsCollected(type, amount);
+            fundsCollectedService.save(funds);
+            post.getFundsCollected().add(funds);
+            donationPostService.save(post);
+        }
         return "redirect:/myPosts";
     }

src/main/resources/templates/myProfile.html

@@ -241 +241 @@
                                             <a class="btn btn-sm btn-outline-secondary"
                                                th:href="@{/post(postid=${post.id})}">Open</a>
-                                            <button type="button" class="btn btn-primary" data-bs-toggle="modal"
-                                                    th:data-bs-target="'#a' + ${post.id}">
+                                            <button type="button" class="btn btn-sm btn-success" data-bs-toggle="modal"
+                                                    th:data-bs-target="'#m' + ${post.id}">
                                                 Add collected funds
                                             </button>
@@ -255 +255 @@
                                 </div>
                             </div>
-                            <div class="modal fade" th:id="'a' + ${post.id}" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1"
+                            <div class="modal fade" th:id="'m' + ${post.id}" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1"
                                  aria-labelledby="staticBackdropLabel" aria-hidden="true">
                                 <div class="modal-dialog modal-dialog-centered">
@@ -267 +267 @@
                                                 <form th:id="'my-form' + ${post.id}" th:action="@{/addFunds(postid=${post.id})}" method="post">
                                                     <div class="row">
-                                                        <div class="col">
-                                                            <select class="input-group-text" name="type">
+                                                        <div class="col-md-6">
+                                                            <label for="type" class="form-label">Type</label>
+                                                            <select id="type" class="form-select" name="type">
                                                                 <option value="Bank donation">Bank donation</option>
                                                                 <option value="Phone donation">Phone donation</option>
                                                             </select>
                                                         </div>
-                                                        <div class="col">
-                                                            <input type="number" class="input-group-text" name="amount">
+                                                        <div class="col-md-6">
+                                                            <label for="amount" class="form-label">Amount</label>
+                                                            <input id="amount" type="number" class="form-control" name="amount">
                                                         </div>
                                                     </div>