Merge pull request #96 from sismics/master

Push to production

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

@@ -92,7 +92,7 @@ public class DocumentResource extends BaseResource {
             TagDao tagDao = new TagDao();
             tagDtoList = tagDao.findByCriteria(
                     new TagCriteria()
-                            .setTargetIdList(getTargetIdList(shareId))
+                            .setTargetIdList(getTargetIdList(null)) // No tags for shares
                             .setDocumentId(documentId),
                     new SortCriteria(1, true));
             JsonArrayBuilder tags = Json.createArrayBuilder();
@@ -270,7 +270,9 @@ public class DocumentResource extends BaseResource {
 
         for (DocumentDto documentDto : paginatedList.getResultList()) {
             // 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();
             for (TagDto tagDto : tagDtoList) {
                 tags.add(Json.createObjectBuilder()

docs-web/src/main/java/com/sismics/docs/rest/resource/ThemeResource.java

@@ -26,6 +26,8 @@ import java.io.OutputStream;
 import java.io.StringReader;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -176,6 +178,7 @@ public class ThemeResource extends BaseResource {
             }
         })
         .header("Content-Type", "image/*")
+        .header("Expires", new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z").format(new Date().getTime() + 3600000 * 24 * 15))
         .build();
     }
 

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

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

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

@@ -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>
 
+<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">
   <h3>Permissions inherited by tags</h3>
 
@@ -25,13 +34,4 @@
       </td>
     </tr>
   </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>

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

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