fixed folder cursor initialization

logicaldoc · Oct 13, 2023 · cc108f6 · cc108f6
1 parent fce5bb2
commit cc108f6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/logicaldoc-gui/build.xml b/logicaldoc-gui/build.xml
@@ -47,6 +47,7 @@
 						<exclude name="setup/" />
 						<exclude name="login/" / -->
 						<exclude name="WEB-INF/**" />
+						<exclude name="**/*.jsp" />
 						<!-- exclude name="skin/" />
 						<exclude name="skin-Tahoe/" />
 						<exclude name="prev/" />

diff --git a/...doc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/browser/FolderCursor.java b/...doc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/browser/FolderCursor.java
@@ -123,11 +123,15 @@ public void onFolderSelected(GUIFolder folder) {
 		if (pagination == null) {
 			pagination = new FolderPagination(folder.getId(), Session.get().getConfigAsInt(GUI_FOLDER_MAXCHILDREN),
 					(int) folder.getSubfolderCount(), 1);
-			if (folder.getGrid() != null && !folder.getGrid().isEmpty())
-				pagination.setPageSize(DocumentGridUtil.getFolderPageSizeFromSpec(folder.getGrid()));
-			else if (Session.get().getUser().getDocsGrid() != null && !Session.get().getUser().getDocsGrid().isEmpty())
-				pagination
-						.setPageSize(DocumentGridUtil.getFolderPageSizeFromSpec(Session.get().getUser().getDocsGrid()));
+			Integer pageSizeFromSpec = null;
+			if (folder.getGrid() != null && !folder.getGrid().isEmpty()) {
+				pageSizeFromSpec = DocumentGridUtil.getFolderPageSizeFromSpec(folder.getGrid());
+			} else if (Session.get().getUser().getDocsGrid() != null
+					&& !Session.get().getUser().getDocsGrid().isEmpty()) {
+				pageSizeFromSpec = DocumentGridUtil.getFolderPageSizeFromSpec(Session.get().getUser().getDocsGrid());
+			}
+			if (pageSizeFromSpec != null)
+				pagination.setPageSize(pageSizeFromSpec);
 
 			// Save it only if there is more than one page
 			if (pagination.getTotalPages() > 1)