Fixed Open in Folder

Author: car031

logicaldoc-core/src/main/java/com/logicaldoc/core/searchengine/FulltextSearch.java

@@ -266,12 +266,8 @@ public void internalSearch() throws SearchException {
 
 	private Map<Long, Hit> buildHitsMap(FulltextSearchOptions opt, Hits results) {
 		Map<Long, Hit> hitsMap = new HashMap<>();
-		System.out.println("----- "+opt.getExpression());
 		while (results != null && results.hasNext()) {
 			Hit hit = results.next();
-
-			System.out.println("hit: "+hit.getId());
-			
 			// Skip a document if not in the filter set
 			if (opt.getFilterIds() != null && !opt.getFilterIds().isEmpty()
 					&& !opt.getFilterIds().contains(hit.getId()))

logicaldoc-core/src/main/java/com/logicaldoc/core/searchengine/StandardSearchEngine.java

@@ -406,8 +406,9 @@ protected SolrQuery prepareSearchQuery(String expression, Set<String> filters, S
 		if (rows != null)
 			query = query.setRows(rows);
 
-		for (String filter : filters)
-			query = query.addFilterQuery(filter);
+		if (CollectionUtils.isNotEmpty(filters))
+			for (String filter : filters)
+				query = query.addFilterQuery(filter);
 
 		query = query.setSort(SortClause.desc("score"));
 		query.set("exprLang", expressionLanguage);

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/FolderNavigator.java

@@ -392,7 +392,7 @@ public void openFolder(final long folderId, final Long documentId) {
 	 */
 	public void openFolder(final long folderId) {
 		getTree().closeAll();
-
+		
 		FolderService.Instance.get().getFolder(folderId, true, true, isPaginationEnabled(), new AsyncCallback<>() {
 
 			@Override
@@ -414,6 +414,7 @@ public void onSuccess(GUIFolder folder) {
 				TreeNode node = new TreeNode(folder.getName());
 				node.setAttribute("id", parent.getAttributeAsString("id") + "-" + Long.toString(folderId));
 				node.setAttribute(FOLDER_ID, Long.toString(folderId));
+				node.setAttribute(PARENT_ID, Long.toString(folder.getParentId()));
 				node.setAttribute("type", Integer.toString(folder.getType()));
 				node.setAttribute(FOLD_REF, folderRef != null ? Long.toString(folderRef) : null);
 				if (folder.getColor() != null)
@@ -458,6 +459,7 @@ private TreeNode getParentNode(GUIFolder folder) {
 			TreeNode node = new TreeNode(fld.getName());
 			node.setAttribute("id", parentId + "-" + Long.toString(fldId));
 			node.setAttribute(FOLDER_ID, Long.toString(fldId));
+			node.setAttribute(PARENT_ID, Long.toString(fld.getParentId()));
 			node.setAttribute("type", Integer.toString(fld.getType()));
 			node.setAttribute(FOLD_REF, fldRef != null ? Long.toString(fldRef) : null);
 			if (fld.getColor() != null)

logicaldoc-webapp/src/main/resources/context.properties

@@ -849,7 +849,6 @@ chat.message.ttl = 30
 default.downloadticket.behavior=download
 
 comparator.BasicComparator.enabled = true
-comparator.WorkShareComparator.enabled = false
 comparator.doc=com.logicaldoc.comparison.basic.BasicComparator
 comparator.docx=com.logicaldoc.comparison.basic.BasicComparator
 comparator.xls=com.logicaldoc.comparison.basic.BasicComparator
@@ -860,6 +859,8 @@ comparator.txt=com.logicaldoc.comparison.basic.BasicComparator
 comparator.html=com.logicaldoc.comparison.basic.BasicComparator
 comparator.xml=com.logicaldoc.comparison.basic.BasicComparator
 comparator.pdf=com.logicaldoc.comparison.basic.BasicComparator
+comparator.LiteraComparator.enabled = false
+comparator.LiteraComparator.lcpauto = C:\\Program Files (x86)\\Litera\\Compare\\lcp_auto.exe
 
 session.ttl = 30