Explorar o código

SelectedCensus listing

Andrew Grant hai 7 meses
pai
achega
d90ebe1e99

+ 1 - 0
src/main/java/scot/carricksoftware/grants/controllers/census/selectedcensus/SelectedCensusListControllerImpl.java

@@ -56,6 +56,7 @@ public class SelectedCensusListControllerImpl implements CensusEntryListControll
     private String sendAttributesAndReturn(Model model) {
         model.addAttribute(AttributeConstants.CENSUS_ENTRIES, selectedCensusEntryService.getPagedCensusEntries(census, currentPage));
         controllerHelper.addAttributes(model);
+        model.addAttribute(AttributeConstants.CENSUS,  census);
         return ViewConstants.SELECTED_CENSUS_LIST;
     }
 

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

@@ -57,7 +57,7 @@
                            th:text="'<<'"></a>
                          <a th:action="back" class="btn btn-secondary btn-sm"
                             th:href="@{/censusEntries/prev}" th:text="'<'"></a>
-                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{censusEntry/new}"
+                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{/censusEntry/new}"
                             th:text="'New Entry'"></a>
                          <a th:action="home" class="btn btn-success btn-sm"
                             th:href="@{/}" th:text="'Home'"></a>

+ 2 - 2
src/main/resources/templates/selectedCensus/list.html

@@ -56,8 +56,8 @@
                         <a th:action="rewind" class="btn btn-secondary btn-sm" th:href="@{/selectedCensus/rewind}"
                            th:text="'<<'"></a>
                          <a th:action="back" class="btn btn-secondary btn-sm"
-                            th:href="@{/templates/censusEntry/prev}" th:text="'<'"></a>
-                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{censusEntry/new}"
+                            th:href="@{/selectedCensus/prev}" th:text="'<'"></a>
+                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{/censusEntry/new}"
                             th:text="'New Entry'"></a>
                          <a th:action="home" class="btn btn-success btn-sm"
                             th:href="@{/}" th:text="'Home'"></a>