vmario/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2024-11-22 14:07:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix inherited ACLs displayed on documents

Browse Source
This commit is contained in:
jendib 2016-05-08 23:40:08 +02:00
parent f41dafe76d
commit 3ff41d2002
No known key found for this signature in database
GPG Key ID: 06EE7F699579166F
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,7 +92,7 @@ public class DocumentResource extends BaseResource {
TagDao tagDao = new TagDao(); TagDao tagDao = new TagDao();
tagDtoList = tagDao.findByCriteria( tagDtoList = tagDao.findByCriteria(
new TagCriteria() new TagCriteria()
.setTargetIdList(getTargetIdList(shareId)) .setTargetIdList(getTargetIdList(null)) // No tags for shares
.setDocumentId(documentId), .setDocumentId(documentId),
new SortCriteria(1, true)); new SortCriteria(1, true));
JsonArrayBuilder tags = Json.createArrayBuilder(); JsonArrayBuilder tags = Json.createArrayBuilder();
@ -270,7 +270,9 @@ public class DocumentResource extends BaseResource {
for (DocumentDto documentDto : paginatedList.getResultList()) { for (DocumentDto documentDto : paginatedList.getResultList()) {
// Get tags added by the current user on this document // Get tags added by the current user on this document
List<TagDto> tagDtoList = tagDao.findByCriteria(new TagCriteria().setTargetIdList(getTargetIdList(null)).setDocumentId(documentDto.getId()), new SortCriteria(1, true)); List<TagDto> tagDtoList = tagDao.findByCriteria(new TagCriteria()
.setTargetIdList(getTargetIdList(null))
.setDocumentId(documentDto.getId()), new SortCriteria(1, true));
JsonArrayBuilder tags = Json.createArrayBuilder(); JsonArrayBuilder tags = Json.createArrayBuilder();
for (TagDto tagDto : tagDtoList) { for (TagDto tagDto : tagDtoList) {
tags.add(Json.createObjectBuilder() tags.add(Json.createObjectBuilder()

2
docs-web/src/main/webapp/src/app/docs/controller/document/DocumentViewPermissions.js
View File

@ -7,7 +7,7 @@ angular.module('docs').controller('DocumentViewPermissions', function($scope) {
// Watch for ACLs change and group them for easy displaying // Watch for ACLs change and group them for easy displaying
$scope.$watch('document.inherited_acls', function(acls) { $scope.$watch('document.inherited_acls', function(acls) {
$scope.inheritedAcls = _.groupBy(acls, function(acl) { $scope.inheritedAcls = _.groupBy(acls, function(acl) {
return acl.id; return acl.source_id;
}); });
}); });
}); });

18
docs-web/src/main/webapp/src/partial/docs/document.view.permissions.html
View File

@ -1,5 +1,14 @@
<p class="well-sm">Permissions can be applied directly to this document, or can come from <a href="#/tag">tags</a>.</p> <p class="well-sm">Permissions can be applied directly to this document, or can come from <a href="#/tag">tags</a>.</p>
<div class="well">
<h3>Permissions on this document</h3>
<acl-edit source="document.id"
acls="document.acls"
writable="document.writable"
creator="document.creator"></acl-edit>
</div>
<div class="well" ng-show="document.inherited_acls.length > 0"> <div class="well" ng-show="document.inherited_acls.length > 0">
<h3>Permissions inherited by tags</h3> <h3>Permissions inherited by tags</h3>
@ -25,13 +34,4 @@
</td> </td>
</tr> </tr>
</table> </table>
</div>
<div class="well">
<h3>Permissions on this document</h3>
<acl-edit source="document.id"
acls="document.acls"
writable="document.writable"
creator="document.creator"></acl-edit>
</div> </div>

2
docs-web/src/test/java/com/sismics/docs/rest/TestShareResource.java
View File

@ -47,7 +47,7 @@ public class TestShareResource extends BaseJerseyTest {
Assert.assertNotNull(document1Id); Assert.assertNotNull(document1Id);
// Add a file // Add a file
String file1Id = null; String file1Id;
try (InputStream is = Resources.getResource("file/PIA00452.jpg").openStream()) { try (InputStream is = Resources.getResource("file/PIA00452.jpg").openStream()) {
StreamDataBodyPart streamDataBodyPart = new StreamDataBodyPart("file", is, "PIA00452.jpg"); StreamDataBodyPart streamDataBodyPart = new StreamDataBodyPart("file", is, "PIA00452.jpg");
try (FormDataMultiPart multiPart = new FormDataMultiPart()) { try (FormDataMultiPart multiPart = new FormDataMultiPart()) {