diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-09 20:39:08 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-09 20:39:08 +0200 |
| commit | 67c92cbbd528180be6e35717297391e891d1540c (patch) | |
| tree | 0cf74366ae074bdd70ca389b1d77b5aaefc32f05 /archaeological_finds | |
| parent | 6ee8c39a2e8e053810bea643fdf0f8c3fa21374b (diff) | |
| download | Ishtar-67c92cbbd528180be6e35717297391e891d1540c.tar.bz2 Ishtar-67c92cbbd528180be6e35717297391e891d1540c.zip | |
Fix tests with bad initialization
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/models.py | 4 | ||||
| -rw-r--r-- | archaeological_finds/tests.py | 15 |
2 files changed, 9 insertions, 10 deletions
diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py index 603e046ee..5811ded6e 100644 --- a/archaeological_finds/models.py +++ b/archaeological_finds/models.py @@ -450,8 +450,8 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): @property def administrative_index(self): bf = self.get_first_base_find() - if not bf: - return + if not bf or not bf.context_record or not bf.context_record.operation: + return "" return "{}-{}".format( bf.context_record.operation.get_reference(), self.index) diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index 1b61d49ca..a0a9f0a8a 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -97,7 +97,7 @@ class ImportFindTest(ImportContextRecordTest): class FindInit(ContextRecordInit): test_context_records = False - def create_finds(self, user=None, data_base={}, data={}): + def create_finds(self, user=None, data_base={}, data={}, force=False): if not getattr(self, 'finds', None): self.finds = [] if not getattr(self, 'base_finds', None): @@ -106,10 +106,9 @@ class FindInit(ContextRecordInit): default = {'label': "Base find"} if not data_base.get('history_modifier'): data_base['history_modifier'] = self.get_default_user() - if not data_base.get('context_record') \ - or not data_base['context_record'].pk: - data_base['context_record'] = self.get_default_context_record() - + if force or not data_base.get('context_record'): + data_base['context_record'] = self.get_default_context_record( + force=force) default.update(data_base) base_find = models.BaseFind.objects.create(**default) self.base_finds.append(base_find) @@ -156,7 +155,7 @@ class FindTest(FindInit, TestCase): model = models.Find def setUp(self): - self.create_finds() + self.create_finds(force=True) def testExternalID(self): find = self.finds[0] @@ -188,8 +187,8 @@ class PackagingTest(FindInit, TestCase): model = models.Find def setUp(self): - self.create_finds({"label": u"Find 1"}) - self.create_finds({"label": u"Find 2"}) + self.create_finds({"label": u"Find 1"}, force=True) + self.create_finds({"label": u"Find 2"}, force=True) self.basket = models.FindBasket.objects.create( label="My basket", user=IshtarUser.objects.get( pk=self.get_default_user().pk)) |