public/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2026-02-18 10:08:56 +00:00
Code Issues Releases Wiki Activity

Closes #227: fix searching by tag

Browse Source
This commit is contained in:
Benjamin Gamard
2018-04-06 23:37:54 +02:00
parent cedd4b47b3
commit 6d35020840
4 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
docs-web/src/main/java/com/sismics/docs/rest/resource/DocumentResource.java
View File

@@ -2,6 +2,7 @@ package com.sismics.docs.rest.resource;
import com.google.common.base.Joiner;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.sismics.docs.core.constant.AclType;
import com.sismics.docs.core.constant.ConfigType;
import com.sismics.docs.core.constant.Constants;
@@ -452,14 +453,17 @@ public class DocumentResource extends BaseResource {
}
if (tagDtoList.isEmpty()) {
// No tag found, the request must returns nothing
documentCriteria.getTagIdList().add(UUID.randomUUID().toString());
}
for (TagDto tagDto : tagDtoList) {
documentCriteria.getTagIdList().add(tagDto.getId());
List<TagDto> childrenTagDtoList = TagUtil.findChildren(tagDto, allTagDtoList);
for (TagDto childrenTagDto : childrenTagDtoList) {
documentCriteria.getTagIdList().add(childrenTagDto.getId());
documentCriteria.getTagIdList().add(Lists.newArrayList(UUID.randomUUID().toString()));
} else {
List<String> tagIdList = Lists.newArrayList();
for (TagDto tagDto : tagDtoList) {
tagIdList.add(tagDto.getId());
List<TagDto> childrenTagDtoList = TagUtil.findChildren(tagDto, allTagDtoList);
for (TagDto childrenTagDto : childrenTagDtoList) {
tagIdList.add(childrenTagDto.getId());
}
}
documentCriteria.getTagIdList().add(tagIdList);
}
break;
case "after":