From 07f24f648504004adbb57b16bd18fbd23a3c3998 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 7 Jun 2018 11:09:35 +0200 Subject: Fix tests and fixtures for new document management (refs #4107) --- ishtar_common/fixtures/initial_data-fr.json | 238 +++------------------------- ishtar_common/models.py | 2 + ishtar_common/tests.py | 2 +- 3 files changed, 23 insertions(+), 219 deletions(-) (limited to 'ishtar_common') diff --git a/ishtar_common/fixtures/initial_data-fr.json b/ishtar_common/fixtures/initial_data-fr.json index b7d9f245a..f1ebe4c71 100644 --- a/ishtar_common/fixtures/initial_data-fr.json +++ b/ishtar_common/fixtures/initial_data-fr.json @@ -59,7 +59,7 @@ "Actes administratifs : lecture" ], [ - "Documents UE : lecture" + "Documents : lecture" ], [ "Traitements : lecture" @@ -67,24 +67,12 @@ [ "Dossiers : lecture" ], - [ - "Documents mobilier : lecture" - ], [ "Auteurs : lecture" ], - [ - "Documents de traitement : lecture" - ], [ "Organisations : lecture" ], - [ - "Documents de demande de traitement : lecture" - ], - [ - "Documents op\u00e9ration : lecture" - ], [ "Contenants : lecture" ] @@ -184,13 +172,13 @@ "Dossiers : cl\u00f4ture" ], [ - "Documents op\u00e9ration : lecture" + "Documents : lecture" ], [ - "Documents op\u00e9ration : modification/suppression" + "Documents : modification/suppression" ], [ - "Documents op\u00e9ration : ajout" + "Documents : ajout" ], [ "Personnes : lecture" @@ -214,13 +202,13 @@ "D\u00e9p\u00f4ts rattach\u00e9s : lecture" ], [ - "Documents op\u00e9ration rattach\u00e9s : ajout" + "Documents rattach\u00e9s : ajout" ], [ - "Documents op\u00e9ration rattach\u00e9s : modification/suppression" + "Documents rattach\u00e9s : modification/suppression" ], [ - "Documents op\u00e9ration rattach\u00e9s : lecture" + "Documents rattach\u00e9s : lecture" ], [ "Dossiers rattach\u00e9s : ajout" @@ -312,78 +300,6 @@ [ "Auteurs : lecture" ], - [ - "Documents UE : lecture" - ], - [ - "Documents UE rattach\u00e9s : lecture" - ], - [ - "Documents UE : ajout" - ], - [ - "Documents UE : modification/suppression" - ], - [ - "Documents UE rattach\u00e9s : modification/suppression" - ], - [ - "Documents UE rattach\u00e9s : ajout" - ], - [ - "Documents mobilier : lecture" - ], - [ - "Documents mobilier : ajout" - ], - [ - "Documents mobilier : modification/suppression" - ], - [ - "Documents mobilier rattach\u00e9s : ajout" - ], - [ - "Documents mobilier rattach\u00e9s : lecture" - ], - [ - "Documents mobilier rattach\u00e9s : modification/suppression" - ], - [ - "Documents de traitement : lecture" - ], - [ - "Documents de traitement : ajout" - ], - [ - "Documents de traitement : modification/suppression" - ], - [ - "Documents de traitement rattach\u00e9s : lecture" - ], - [ - "Documents de traitement rattach\u00e9s : ajout" - ], - [ - "Documents de traitement rattach\u00e9s : modification/suppression" - ], - [ - "Documents de demande de traitement : lecture" - ], - [ - "Documents de demande de traitement : ajout" - ], - [ - "Documents de demande de traitement : modification/suppression" - ], - [ - "Documents de demande de traitement rattach\u00e9s : lecture" - ], - [ - "Documents de demande de traitement rattach\u00e9s : ajout" - ], - [ - "Documents de demande de traitement rattach\u00e9s : modification/suppression" - ], [ "Import : ajout/modification/suppression" ] @@ -428,13 +344,13 @@ "D\u00e9p\u00f4ts rattach\u00e9s : lecture" ], [ - "Documents op\u00e9ration rattach\u00e9s : ajout" + "Documents rattach\u00e9s : ajout" ], [ - "Documents op\u00e9ration rattach\u00e9s : modification/suppression" + "Documents rattach\u00e9s : modification/suppression" ], [ - "Documents op\u00e9ration rattach\u00e9s : lecture" + "Documents rattach\u00e9s : lecture" ], [ "Mobilier rattach\u00e9 : ajout" @@ -477,30 +393,6 @@ ], [ "Auteurs : lecture" - ], - [ - "Documents UE rattach\u00e9s : lecture" - ], - [ - "Documents UE rattach\u00e9s : modification/suppression" - ], - [ - "Documents UE rattach\u00e9s : ajout" - ], - [ - "Documents mobilier rattach\u00e9s : ajout" - ], - [ - "Documents mobilier rattach\u00e9s : lecture" - ], - [ - "Documents mobilier rattach\u00e9s : modification/suppression" - ], - [ - "Documents de traitement rattach\u00e9s : lecture" - ], - [ - "Documents de demande de traitement rattach\u00e9s : lecture" ] ] } @@ -566,7 +458,7 @@ "Organisations : lecture" ], [ - "Documents op\u00e9ration : lecture" + "Documents : lecture" ], [ "Personnes : lecture" @@ -588,36 +480,6 @@ ], [ "Auteurs : lecture" - ], - [ - "Documents UE : lecture" - ], - [ - "Documents mobilier : lecture" - ], - [ - "Documents mobilier : ajout" - ], - [ - "Documents mobilier : modification/suppression" - ], - [ - "Documents de traitement : lecture" - ], - [ - "Documents de traitement : ajout" - ], - [ - "Documents de traitement : modification/suppression" - ], - [ - "Documents de demande de traitement : lecture" - ], - [ - "Documents de demande de traitement : ajout" - ], - [ - "Documents de demande de traitement : modification/suppression" ] ] } @@ -703,13 +565,13 @@ "Dossiers : cl\u00f4ture" ], [ - "Documents op\u00e9ration : lecture" + "Documents : lecture" ], [ - "Documents op\u00e9ration : modification/suppression" + "Documents : modification/suppression" ], [ - "Documents op\u00e9ration : ajout" + "Documents : ajout" ], [ "Personnes : lecture" @@ -725,30 +587,6 @@ ], [ "Auteurs : lecture" - ], - [ - "Documents UE : lecture" - ], - [ - "Documents UE : ajout" - ], - [ - "Documents UE : modification/suppression" - ], - [ - "Documents mobilier : lecture" - ], - [ - "Documents mobilier : ajout" - ], - [ - "Documents mobilier : modification/suppression" - ], - [ - "Documents de traitement : lecture" - ], - [ - "Documents de demande de traitement : lecture" ] ] } @@ -774,13 +612,13 @@ "D\u00e9p\u00f4ts rattach\u00e9s : lecture" ], [ - "Documents op\u00e9ration rattach\u00e9s : ajout" + "Documents rattach\u00e9s : ajout" ], [ - "Documents op\u00e9ration rattach\u00e9s : modification/suppression" + "Documents rattach\u00e9s : modification/suppression" ], [ - "Documents op\u00e9ration rattach\u00e9s : lecture" + "Documents rattach\u00e9s : lecture" ], [ "Dossiers rattach\u00e9s : lecture" @@ -829,30 +667,6 @@ ], [ "Auteurs : lecture" - ], - [ - "Documents UE rattach\u00e9s : lecture" - ], - [ - "Documents UE rattach\u00e9s : modification/suppression" - ], - [ - "Documents UE rattach\u00e9s : ajout" - ], - [ - "Documents mobilier rattach\u00e9s : ajout" - ], - [ - "Documents mobilier rattach\u00e9s : lecture" - ], - [ - "Documents mobilier rattach\u00e9s : modification/suppression" - ], - [ - "Documents de traitement rattach\u00e9s : lecture" - ], - [ - "Documents de demande de traitement rattach\u00e9s : lecture" ] ] } @@ -926,13 +740,13 @@ "Dossiers : cl\u00f4ture" ], [ - "Documents op\u00e9ration : lecture" + "Documents : lecture" ], [ - "Documents op\u00e9ration : modification/suppression" + "Documents : modification/suppression" ], [ - "Documents op\u00e9ration : ajout" + "Documents : ajout" ], [ "Personnes : lecture" @@ -948,18 +762,6 @@ ], [ "Auteurs : lecture" - ], - [ - "Documents UE : lecture" - ], - [ - "Documents mobilier : lecture" - ], - [ - "Documents de traitement : lecture" - ], - [ - "Documents de demande de traitement : lecture" ] ] } diff --git a/ishtar_common/models.py b/ishtar_common/models.py index d13def4c7..758596279 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1212,6 +1212,8 @@ class FixAssociated(object): class DocumentItem(object): @property def images(self): + if not hasattr(self, 'documents'): + return Document.objects.none() return self.documents.filter(image__isnull=False).exclude(image="") diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index b28dde5ec..8d85e3cba 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -1220,7 +1220,7 @@ class ShortMenuTest(TestCase): session.save() response = c.get(reverse('shortcut-menu')) self.assertEqual(response.status_code, 200) - response = c.get(reverse('get-findsource')) + response = c.get(reverse('get-document')) self.assertEqual(response.status_code, 200) -- cgit v1.2.3