vmario/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2024-07-03 06:51:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor, TODO

Browse Source
This commit is contained in:
jendib 2015-05-09 23:34:43 +02:00
parent 52387d93ac
commit c727ac3a56
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,7 @@ public class DocumentResource extends BaseResource {
document.put("description", documentDb.getDescription()); document.put("description", documentDb.getDescription());
document.put("create_date", documentDb.getCreateDate().getTime()); document.put("create_date", documentDb.getCreateDate().getTime());
document.put("language", documentDb.getLanguage()); document.put("language", documentDb.getLanguage());
document.put("creator", userDao.getById(documentDb.getUserId()).getUsername()); // TODO Add "shared" and "file_count" -> rewrite the query in SQL
if (principal.isAnonymous()) { if (principal.isAnonymous()) {
// No tags in anonymous mode (sharing) // No tags in anonymous mode (sharing)
@ -123,6 +123,10 @@ public class DocumentResource extends BaseResource {
document.put("tags", tags); document.put("tags", tags);
} }
// Below is specific to GET /document/id
document.put("creator", userDao.getById(documentDb.getUserId()).getUsername());
// Add ACL // Add ACL
List<AclDto> aclDtoList = aclDao.getBySourceId(documentId); List<AclDto> aclDtoList = aclDao.getBySourceId(documentId);
List<JSONObject> aclList = new ArrayList<>(); List<JSONObject> aclList = new ArrayList<>();
@ -190,8 +194,8 @@ public class DocumentResource extends BaseResource {
document.put("title", documentDto.getTitle()); document.put("title", documentDto.getTitle());
document.put("description", documentDto.getDescription()); document.put("description", documentDto.getDescription());
document.put("create_date", documentDto.getCreateTimestamp()); document.put("create_date", documentDto.getCreateTimestamp());
document.put("shared", documentDto.getShared());
document.put("language", documentDto.getLanguage()); document.put("language", documentDto.getLanguage());
document.put("shared", documentDto.getShared());
document.put("file_count", documentDto.getFileCount()); document.put("file_count", documentDto.getFileCount());
// Get tags added by the current user on this document // Get tags added by the current user on this document