Skip to content

Commit 1e67fc4

Browse files
updated Spring Data JPA
1 parent ef23891 commit 1e67fc4

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

pom.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<org.aspectj-version>1.6.12</org.aspectj-version>
1515
<org.slf4j-version>1.7.6</org.slf4j-version>
1616
<maven.scm.version>1.9.2</maven.scm.version>
17+
<encoding>UTF-8</encoding>
1718
</properties>
1819
<dependencies>
1920
<!-- Spring -->
@@ -180,12 +181,7 @@
180181
<dependency>
181182
<groupId>org.springframework.data</groupId>
182183
<artifactId>spring-data-jpa</artifactId>
183-
<version>1.5.1.RELEASE</version>
184-
</dependency>
185-
<dependency>
186-
<groupId>org.springframework.data</groupId>
187-
<artifactId>spring-data-mongodb</artifactId>
188-
<version>1.4.1.RELEASE</version>
184+
<version>1.7.2.RELEASE</version>
189185
</dependency>
190186

191187
<!-- Security -->

src/main/webapp/WEB-INF/jsp/admin/taxes/countriesPager.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<td class="smallText" valign="top">Displaying <strong>${countries.number*20+1}</strong> to <strong>${countries.number*20+countries.numberOfElements}</strong> (of <strong>${countries.totalElements}</strong> countries)</td>
55
<td class="smallText" align="right">
66
<form name="pages" action="<c:url value="/admin/countries"/>" method="get"><c:choose>
7-
<c:when test="${countries.hasPreviousPage()}"><a href="<c:url value="/admin/countries?page=${countries.previousPageable().pageNumber}"/>" class="splitPageLink">&lt;&lt;</a></c:when>
7+
<c:when test="${countries.hasPrevious()}"><a href="<c:url value="/admin/countries?page=${countries.previousPageable().pageNumber}"/>" class="splitPageLink">&lt;&lt;</a></c:when>
88
<c:otherwise>&lt;&lt;</c:otherwise>
99
</c:choose>&nbsp;&nbsp;Page <select name="page" onchange="this.form.submit();">
1010
<c:forEach begin="0" end="${countries.totalPages-1}" varStatus="status">
@@ -18,7 +18,7 @@
1818
</c:choose>
1919
</c:forEach>
2020
</select> of ${countries.totalPages}&nbsp;&nbsp;<c:choose>
21-
<c:when test="${countries.hasNextPage()}"><a href="<c:url value="/admin/countries?page=${countries.nextPageable().pageNumber}"/>" class="splitPageLink">&gt;&gt;</a></c:when>
21+
<c:when test="${countries.hasNext()}"><a href="<c:url value="/admin/countries?page=${countries.nextPageable().pageNumber}"/>" class="splitPageLink">&gt;&gt;</a></c:when>
2222
<c:otherwise>&gt;&gt;</c:otherwise>
2323
</c:choose></form>
2424
</td>

src/main/webapp/WEB-INF/jsp/admin/taxes/taxZonesPager.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<td class="smallText" valign="top">Displaying <strong>${taxZones.number*20+1}</strong> to <strong>${taxZones.number*20+countries.numberOfElements}</strong> (of <strong>${taxZones.totalElements}</strong> Tax Zones)</td>
55
<td class="smallText" align="right">
66
<form name="pages" action="<c:url value="/admin/taxZones"/>" method="get"><c:choose>
7-
<c:when test="${taxZones.hasPreviousPage()}"><a href="<c:url value="/admin/taxZones?page=${taxZones.previousPageable().pageNumber}"/>" class="splitPageLink">&lt;&lt;</a></c:when>
7+
<c:when test="${taxZones.hasPrevious()}"><a href="<c:url value="/admin/taxZones?page=${taxZones.previousPageable().pageNumber}"/>" class="splitPageLink">&lt;&lt;</a></c:when>
88
<c:otherwise>&lt;&lt;</c:otherwise>
99
</c:choose>&nbsp;&nbsp;Page <select name="page" onchange="this.form.submit();">
1010
<c:forEach begin="0" end="${taxZones.totalPages-1}" varStatus="status">
@@ -18,7 +18,7 @@
1818
</c:choose>
1919
</c:forEach>
2020
</select> of ${taxZones.totalPages}&nbsp;&nbsp;<c:choose>
21-
<c:when test="${taxZones.hasNextPage()}"><a href="<c:url value="/admin/taxZones?page=${taxZones.nextPageable().pageNumber}"/>" class="splitPageLink">&gt;&gt;</a></c:when>
21+
<c:when test="${taxZones.hasNext()}"><a href="<c:url value="/admin/taxZones?page=${taxZones.nextPageable().pageNumber}"/>" class="splitPageLink">&gt;&gt;</a></c:when>
2222
<c:otherwise>&gt;&gt;</c:otherwise>
2323
</c:choose></form>
2424
</td>

src/main/webapp/WEB-INF/jsp/admin/taxes/zonesPager.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<td class="smallText" valign="top">Displaying <strong>${zones.number*20+1}</strong> to <strong>${zones.number*20+zones.numberOfElements}</strong> (of <strong>${zones.totalElements}</strong> zones)</td>
44
<td class="smallText" align="right">
55
<form name="pages" action="<c:url value="/admin/zones"/>" method="get"><c:choose>
6-
<c:when test="${zones.hasPreviousPage()}"><a href="<c:url value="/admin/zones?page=${zones.previousPageable().pageNumber}"/>" class="splitPageLink">&lt;&lt;</a></c:when>
6+
<c:when test="${zones.hasPrevious()}"><a href="<c:url value="/admin/zones?page=${zones.previousPageable().pageNumber}"/>" class="splitPageLink">&lt;&lt;</a></c:when>
77
<c:otherwise>&lt;&lt;</c:otherwise>
88
</c:choose>&nbsp;&nbsp;Page <select name="page" onchange="this.form.submit();">
99
<c:forEach begin="0" end="${zones.totalPages-1}" varStatus="status">
@@ -17,7 +17,7 @@
1717
</c:choose>
1818
</c:forEach>
1919
</select> of ${zones.totalPages}&nbsp;&nbsp;<c:choose>
20-
<c:when test="${zones.hasNextPage()}"><a href="<c:url value="/admin/zones?page=${zones.nextPageable().pageNumber}"/>" class="splitPageLink">&gt;&gt;</a></c:when>
20+
<c:when test="${zones.hasNext()}"><a href="<c:url value="/admin/zones?page=${zones.nextPageable().pageNumber}"/>" class="splitPageLink">&gt;&gt;</a></c:when>
2121
<c:otherwise>&gt;&gt;</c:otherwise>
2222
</c:choose></form>
2323
</td>

0 commit comments

Comments
 (0)