Эх сурвалжийг харах

Organisation form controller ::update ::delete

Andrew Grant 6 сар өмнө
parent
commit
5dee84336b

+ 5 - 0
src/main/java/scot/carricksoftware/grants/controllers/places/organisations/OrganisationFormController.java

@@ -20,9 +20,14 @@ public interface OrganisationFormController {
     @GetMapping(MappingConstants.ORGANISATION_NEW)
     String getNewOrganisation(Model model);
 
+    @SuppressWarnings("unused")
     String saveOrUpdate(@Valid @ModelAttribute OrganisationCommand organisationCommand, BindingResult bindingResult, Model model);
 
     @SuppressWarnings("SameReturnValue")
     @GetMapping(MappingConstants.ORGANISATION_SHOW)
     String showById(@PathVariable String id, Model model);
+
+    @SuppressWarnings("SameReturnValue")
+    @GetMapping(MappingConstants.ORGANISATION_EDIT)
+    String organisationEdit(@Valid @PathVariable String id, Model model);
 }

+ 10 - 0
src/main/java/scot/carricksoftware/grants/controllers/places/organisations/OrganisationFormControllerImpl.java

@@ -91,4 +91,14 @@ public class OrganisationFormControllerImpl implements OrganisationFormControlle
         return ViewConstants.ORGANISATION_FORM;
     }
 
+    @SuppressWarnings("SameReturnValue")
+    @GetMapping(MappingConstants.ORGANISATION_EDIT)
+    @Override
+    public final String organisationEdit(@Valid @PathVariable final String id, Model model) {
+        logger.debug("OrganisationFormControllerImpl::organisationEdit");
+        model.addAttribute(AttributeConstants.ORGANISATION_COMMAND, organisationService.findById(Long.valueOf(id)));
+        return ViewConstants.ORGANISATION_FORM;
+    }
+
+
 }

+ 1 - 0
src/main/java/scot/carricksoftware/grants/controllers/places/organisations/OrganisationListController.java

@@ -31,5 +31,6 @@ public interface OrganisationListController {
     @GetMapping(MappingConstants.ORGANISATION_DELETE)
     String organisationDelete(@PathVariable String id);
 
+    @SuppressWarnings("unused")
     int getPageNumber();
 }

+ 1 - 1
src/main/java/scot/carricksoftware/grants/controllers/places/organisations/OrganisationListControllerImpl.java

@@ -89,7 +89,6 @@ public class OrganisationListControllerImpl implements OrganisationListControlle
         return sendAttributesAndReturn(model);
     }
 
-
     @SuppressWarnings("SameReturnValue")
     @GetMapping(MappingConstants.ORGANISATION_DELETE)
     @Override
@@ -104,4 +103,5 @@ public class OrganisationListControllerImpl implements OrganisationListControlle
         return currentPage;
     }
 
+
 }

+ 1 - 0
src/main/java/scot/carricksoftware/grants/services/places/organisations/OrganisationService.java

@@ -22,6 +22,7 @@ public interface OrganisationService {
 
     OrganisationCommand saveOrganisationCommand(OrganisationCommand organisationCommand);
 
+    @SuppressWarnings("unused")
     List<Organisation> findAll();
 
     Organisation findById(Long id);

+ 1 - 1
src/main/resources/templates/organisation/list.html

@@ -34,7 +34,7 @@
                 <td th:text="${organisation.name}"> First</td>
                 <td><span>
                         <a th:action="delete" class="btn btn-danger btn-sm"
-                           th:href="@{/orgaisation/{id}/delete(id=${organisation.id})}"
+                           th:href="@{/organisation/{id}/delete(id=${organisation.id})}"
                            th:text="Delete"></a>
                     <a th:action="edit" class="btn btn-warning btn-sm"
                        th:href="@{/organisation/{id}/edit(id=${organisation.id})}"