Fix missing super group deletion

cthit · Aug 31, 2024 · 1768e52 · 1768e52
1 parent 1b796a2
commit 1768e52
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app/src/main/java/it/chalmers/gamma/adapter/primary/web/SuperGroupsController.java b/app/src/main/java/it/chalmers/gamma/adapter/primary/web/SuperGroupsController.java
@@ -206,7 +206,7 @@ public ModelAndView deleteSuperGroup(
       throw new RuntimeException(e);
     }
 
-    return new ModelAndView("common/empty");
+    return new ModelAndView("redirect:/super-groups");
   }
 
   public record CreateSuperGroupForm(

diff --git a/app/src/main/resources/templates/pages/super-group-details.html b/app/src/main/resources/templates/pages/super-group-details.html
@@ -26,12 +26,17 @@
                 <span th:text="${superGroup.type()}"></span>
             </li>
         </ul>
-        <footer>
+        <footer th:if="${isAdmin}">
             <button th:data-hx-get="@{/super-groups/{superGroupId}/edit(superGroupId=${superGroup.id()})}"
+                class="outline contrast"
                 data-hx-target="closest article"
                 data-hx-swap="outerHTML">
                 Edit
             </button>
+            <form data-hx-confirm="Are you sure you want to delete this super group?"
+                  th:action="|/super-groups/${superGroup.id()}|" th:method="delete" th:if="${usages.size() == 0}">
+                <button class="outline contrast" data-loading-disable>Delete</button>
+            </form>
         </footer>
     </article>
     <article>