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

Closes #91: Display ACL inherited from tags in document permissions

Browse Source
This commit is contained in:
jendib
2016-05-08 13:45:46 +02:00
parent 642b9a63d3
commit bf4cb02de5
8 changed files with 87 additions and 15 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
+23 -3
View File
@@ -82,14 +82,15 @@ public class DocumentResource extends BaseResource {
.add("language", documentDto.getLanguage())
.add("shared", documentDto.getShared())
.add("file_count", documentDto.getFileCount());
List<TagDto> tagDtoList = null;
if (principal.isAnonymous()) {
// No tags in anonymous mode (sharing)
document.add("tags", Json.createArrayBuilder());
} else {
// Add tags added by the current user on this document
// Add tags visible by the current user on this document
TagDao tagDao = new TagDao();
List<TagDto> tagDtoList = tagDao.findByCriteria(
tagDtoList = tagDao.findByCriteria(
new TagCriteria()
.setTargetIdList(getTargetIdList(shareId))
.setDocumentId(documentId),
@@ -117,6 +118,25 @@ public class DocumentResource extends BaseResource {
// Add ACL
AclUtil.addAcls(document, documentId, getTargetIdList(shareId));
// Add computed ACL
if (tagDtoList != null) {
JsonArrayBuilder aclList = Json.createArrayBuilder();
for (TagDto tagDto : tagDtoList) {
AclDao aclDao = new AclDao();
List<AclDto> aclDtoList = aclDao.getBySourceId(tagDto.getId());
for (AclDto aclDto : aclDtoList) {
aclList.add(Json.createObjectBuilder()
.add("perm", aclDto.getPerm().name())
.add("source_id", tagDto.getId())
.add("source_name", tagDto.getName())
.add("id", aclDto.getTargetId())
.add("name", JsonUtil.nullable(aclDto.getTargetName()))
.add("type", aclDto.getTargetType()));
}
}
document.add("inherited_acls", aclList);
}
// Add contributors
ContributorDao contributorDao = new ContributorDao();