basketballcantho/Teedy_custom
1
0
Fork 0
mirror of https://git.victorphan.net/basketballcantho/Teedy_custom.git synced 2026-08-05 22:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Closes #67: Relations between document (client-side)

Browse Source
This commit is contained in:
jendib
2016-03-12 20:29:02 +01:00
parent 0525754337
commit ff91521a67
10 changed files with 125 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs-web/src/main/java/com/sismics/docs/rest/resource/DocumentResource.java
+4 -2
View File
@@ -181,7 +181,8 @@ public class DocumentResource extends BaseResource {
for (RelationDto relationDto : relationDtoList) {
relationList.add(Json.createObjectBuilder()
.add("id", relationDto.getId())
.add("title", relationDto.getTitle()));
.add("title", relationDto.getTitle())
.add("source", relationDto.isSource()));
}
document.add("relations", relationList);
@@ -669,7 +670,8 @@ public class DocumentResource extends BaseResource {
RelationDao relationDao = new RelationDao();
Set<String> documentIdSet = new HashSet<>();
for (String targetDocId : relationList) {
Document document = documentDao.getDocument(targetDocId, PermType.READ, principal.getId());
// ACL are not checked, because the editing user is not forced to view the target document
Document document = documentDao.getById(targetDocId);
if (document != null && !documentId.equals(targetDocId)) {
documentIdSet.add(targetDocId);
}