Skip to content

Commit 192478a

Browse files
committed
Fixed method getDocumentChildren to handle correctly archived documents
1 parent 973d9fa commit 192478a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

logicaldoc-webdav/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<include name="**/Rest*.class" />
6969
<include name="**/context-webservice.xml" />
7070
-->
71-
<include name="**/*.class" />
71+
<include name="**/ResourceServiceImpl*.class" />
7272
</fileset>
7373
</copy>
7474
</sequential>

logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/resource/service/ResourceServiceImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import java.io.InputStream;
66
import java.util.Arrays;
77
import java.util.Collection;
8-
import java.util.Iterator;
98
import java.util.LinkedList;
109
import java.util.List;
1110

@@ -185,9 +184,10 @@ public List<Resource> getChildResources(Resource parentResource) throws DavExcep
185184

186185
private void getDocumentChildren(Resource parentResource, List<Resource> resourceList, User user)
187186
throws PersistenceException {
188-
Collection<Document> documents = documentDAO.findByFolder(Long.parseLong(parentResource.getID()), null);
189-
for (Iterator<Document> iterator = documents.iterator(); iterator.hasNext();) {
190-
Document document = iterator.next();
187+
188+
Collection<Document> documents = documentDAO.findByFileNameAndParentFolderId(
189+
Long.parseLong(parentResource.getID()), "", null, user.getTenantId(), null);
190+
for (Document document : documents) {
191191
try {
192192
checkPublished(user, document);
193193
} catch (Exception t) {

0 commit comments

Comments
 (0)