Merge branch 'release/4.4.6'

build.gradle

@@ -10,7 +10,7 @@ plugins {
 }
 
 group = 'info.textgrid.rep'
-version = '4.4.5'
+version = '4.4.6'
 sourceCompatibility = '17'
 
 bootWar {

src/main/java/info/textgrid/rep/service/TgsearchClientService.java

@@ -157,7 +157,7 @@ public class TgsearchClientService {
     try {
       project = searchClient.projectQuery().setSearchSandbox(sandbox).projectDetails(projectId);
     } catch (WebApplicationException e) {
-      log.error(e.getClass().getSimpleName() + " thrown querying calling getProjectConfig(" + projectId + ", " + sandbox
+      log.error(e.getClass().getSimpleName() + " thrown calling getProjectConfig(" + projectId + ", " + sandbox
           + "): " + e.getMessage());
     }
     return project;
@@ -179,7 +179,14 @@ public class TgsearchClientService {
   }
 
   public Response listProjectsToplevelObjects(String id, int start, int limit, boolean sandbox) {
-    return searchClient.projectQuery().setSearchSandbox(sandbox).listToplevelAggregations(id, start, limit);
+    Response res = null;
+    try {
+      res = searchClient.projectQuery().setSearchSandbox(sandbox).listToplevelAggregations(id, start, limit);
+    } catch (WebApplicationException e) {
+      log.error(e.getClass().getSimpleName() + " thrown calling listProjectsToplevelObjects(" + id + ", " + start
+          + ", "+limit+"): " + e.getMessage());
+    }
+    return res;
   }
 
   public Revisions listRevisions(String id) {

src/main/webapp/WEB-INF/jsp/components/pager.jsp

@@ -25,7 +25,8 @@
       </li>
 
       <li class="tg pagination_item">
-        <a class="tg pagination_link -prev" href="?query=${query}${filterQueryString}&start=${pager.start - pager.limit}&limit=${pager.limit}&order=${order}&mode=${mode}" title="${i18n['go-to-previous-page']}">
+        <!-- previous start shall be 0 if limit is bigger than start, else (start - limit), to prevent negative values (may occur when changing limits), see https://gitlab.gwdg.de/dariah-de/textgridrep-portal/-/issues/232 -->
+        <a class="tg pagination_link -prev" href="?query=${query}${filterQueryString}&start=${pager.start < pager.limit ? 0 : pager.start - pager.limit}&limit=${pager.limit}&order=${order}&mode=${mode}" title="${i18n['go-to-previous-page']}">
           <span class="sr-only">${i18n['previous-page']}</span>
         </a>
       </li>