#20: Display logs on documents

This commit is contained in:
jendib
2015-05-23 19:16:38 +02:00
parent ea4e3fd8f2
commit 6add34bb33
10 changed files with 117 additions and 49 deletions
@@ -45,7 +45,7 @@ public class AuditLogResource extends BaseResource {
}
// On a document or a user?
PaginatedList<AuditLogDto> paginatedList = PaginatedLists.create(100, 0);
PaginatedList<AuditLogDto> paginatedList = PaginatedLists.create(20, 0);
SortCriteria sortCriteria = new SortCriteria(1, true);
AuditLogCriteria criteria = new AuditLogCriteria();
if (documentId == null) {
@@ -57,6 +57,7 @@ import com.sismics.rest.exception.ServerException;
import com.sismics.rest.util.ValidationUtil;
import com.sismics.util.mime.MimeType;
import com.sismics.util.mime.MimeTypeUtil;
import com.sun.jersey.api.client.ClientResponse.Status;
import com.sun.jersey.multipart.FormDataBodyPart;
import com.sun.jersey.multipart.FormDataParam;
@@ -417,7 +418,7 @@ public class FileResource extends BaseResource {
}
}
} catch (NoResultException e) {
throw new ClientException("FileNotFound", MessageFormat.format("File not found: {0}", fileId));
return Response.status(Status.NOT_FOUND).build();
}
@@ -461,7 +462,7 @@ public class FileResource extends BaseResource {
}
};
} catch (Exception e) {
throw new ServerException("FileError", "Error while reading the file", e);
return Response.status(Status.SERVICE_UNAVAILABLE).build();
}
return Response.ok(stream)