diff --git a/docs-core/src/main/java/com/sismics/docs/core/dao/criteria/DocumentCriteria.java b/docs-core/src/main/java/com/sismics/docs/core/dao/criteria/DocumentCriteria.java index 1e6b46afc..8d69f3814 100644 --- a/docs-core/src/main/java/com/sismics/docs/core/dao/criteria/DocumentCriteria.java +++ b/docs-core/src/main/java/com/sismics/docs/core/dao/criteria/DocumentCriteria.java @@ -84,9 +84,9 @@ public class DocumentCriteria { private String mimeType; /** - * The title. + * Titles to include. */ - private String title; + private List titleList = new ArrayList<>(); public List getTargetIdList() { return targetIdList; @@ -192,11 +192,7 @@ public void setMimeType(String mimeType) { this.mimeType = mimeType; } - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; + public List getTitleList() { + return titleList; } } diff --git a/docs-core/src/main/java/com/sismics/docs/core/util/indexing/LuceneIndexingHandler.java b/docs-core/src/main/java/com/sismics/docs/core/util/indexing/LuceneIndexingHandler.java index e9e8e734f..bdb0f030e 100644 --- a/docs-core/src/main/java/com/sismics/docs/core/util/indexing/LuceneIndexingHandler.java +++ b/docs-core/src/main/java/com/sismics/docs/core/util/indexing/LuceneIndexingHandler.java @@ -295,9 +295,9 @@ public void findByCriteria(PaginatedList paginatedList, ListAprès l'importation d'un email, celui-ci sera marqué comme lu.
Paramétrage pour Gmail, Outlook.com, Yahoo.", "enabled": "Activer le scan de boîte de réception", "hostname": "Nom d'hôte IMAP", "port": "Port IMAP (143 ou 993)", + "starttls": "Activer STARTTLS", "username": "Nom d'utilisateur IMAP", "password": "Mot de passe IMAP", "folder": "Dossier IMAP", @@ -436,7 +449,9 @@ "last_sync": "Dernière synchronisation : {{ data.date | date: 'medium' }}, {{ data.count }} message{{ data.count> 1 ? 's' : '' }} importé{{ data.count> 1 ? 's' : '' }}", "test_success": "La connexion à la boîte de réception est réussie ({{ count }} message{{ count> 1 ? 's' : '' }}) non lus", "test_fail": "Une erreur est survenue lors de la connexion à la boîte de réception, veuillez vérifier les paramètres", - "saved": "Configuration IMAP sauvegardée avec succès" + "saved": "Configuration IMAP sauvegardée avec succès", + "autoTagsEnabled": "Ajouter automatiquement les tags des titres marqués par #", + "deleteImported": "Supprimer les messages de la boîte de réception après leur importation" }, "monitoring": { "background_tasks": "Tâches d'arrière-plan", @@ -622,4 +637,4 @@ "send": "Envoyer", "enabled": "Activé", "disabled": "Désactivé" -} \ No newline at end of file +} diff --git a/docs-web/src/test/java/com/sismics/docs/rest/TestDocumentResource.java b/docs-web/src/test/java/com/sismics/docs/rest/TestDocumentResource.java index 7304e4d99..5061ca5cb 100644 --- a/docs-web/src/test/java/com/sismics/docs/rest/TestDocumentResource.java +++ b/docs-web/src/test/java/com/sismics/docs/rest/TestDocumentResource.java @@ -81,8 +81,17 @@ public void testDocumentResource() throws Exception { .param("create_date", Long.toString(create1Date))), JsonObject.class); String document1Id = json.getString("id"); Assert.assertNotNull(document1Id); - - // Create a document with document1 + + // Add a file to this document + String file1Id = clientUtil.addFileToDocument(FILE_EINSTEIN_ROOSEVELT_LETTER_PNG, + document1Token, document1Id); + + // Share this document + target().path("/share").request() + .cookie(TokenBasedSecurityFilter.COOKIE_NAME, document1Token) + .put(Entity.form(new Form().param("id", document1Id)), JsonObject.class); + + // Create another document with document1 json = target().path("/document").request() .cookie(TokenBasedSecurityFilter.COOKIE_NAME, document1Token) .put(Entity.form(new Form() @@ -92,16 +101,7 @@ public void testDocumentResource() throws Exception { .param("relations", document1Id)), JsonObject.class); String document2Id = json.getString("id"); Assert.assertNotNull(document2Id); - - // Add a file - String file1Id = clientUtil.addFileToDocument(FILE_EINSTEIN_ROOSEVELT_LETTER_PNG, - document1Token, document1Id); - // Share this document - target().path("/share").request() - .cookie(TokenBasedSecurityFilter.COOKIE_NAME, document1Token) - .put(Entity.form(new Form().param("id", document1Id)), JsonObject.class); - // List all documents json = target().path("/document/list") .queryParam("sort_column", 3) @@ -148,10 +148,19 @@ public void testDocumentResource() throws Exception { String document3Id = json.getString("id"); Assert.assertNotNull(document3Id); - // Add a file + // Add a file to this document clientUtil.addFileToDocument(FILE_EINSTEIN_ROOSEVELT_LETTER_PNG, document3Token, document3Id); + // Create another document with document3 + json = target().path("/document").request() + .cookie(TokenBasedSecurityFilter.COOKIE_NAME, document3Token) + .put(Entity.form(new Form() + .param("title", "My_super_title_document_4") + .param("language", "eng")), JsonObject.class); + String document4Id = json.getString("id"); + Assert.assertNotNull(document4Id); + // List all documents from document3 json = target().path("/document/list") .queryParam("sort_column", 3) @@ -160,7 +169,7 @@ public void testDocumentResource() throws Exception { .cookie(TokenBasedSecurityFilter.COOKIE_NAME, document3Token) .get(JsonObject.class); documents = json.getJsonArray("documents"); - Assert.assertEquals(1, documents.size()); + Assert.assertEquals(2, documents.size()); // Check highlights json = target().path("/document/list") @@ -216,6 +225,7 @@ public void testDocumentResource() throws Exception { Assert.assertEquals(0, searchDocuments("mime:empty/void", document1Token)); Assert.assertEquals(1, searchDocuments("after:2010 before:2040-08 tag:super shared:yes lang:eng simple:title simple:description full:uranium", document1Token)); Assert.assertEquals(1, searchDocuments("title:My_super_title_document_3", document3Token)); + Assert.assertEquals(2, searchDocuments("title:My_super_title_document_3 title:My_super_title_document_4", document3Token)); // Search documents (nothing) Assert.assertEquals(0, searchDocuments("random", document1Token));