diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-05-23 10:53:43 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-05-23 10:53:43 +0200 |
| commit | 6ae680af7ff8118341cf244b1b41e5e04644ba14 (patch) | |
| tree | fd85fae64a1a0c00c8efb9afb98614fe1c8fa8c7 /archaeological_finds | |
| parent | 42e31c5060a61e42822a166928b7aa39da7867fc (diff) | |
| download | Ishtar-6ae680af7ff8118341cf244b1b41e5e04644ba14.tar.bz2 Ishtar-6ae680af7ff8118341cf244b1b41e5e04644ba14.zip | |
Document generation: better layout for VALUES
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/models_finds.py | 22 | ||||
| -rw-r--r-- | archaeological_finds/models_treatments.py | 8 |
2 files changed, 18 insertions, 12 deletions
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index d3abd2c8a..e62c41887 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -333,12 +333,13 @@ class BaseFind(BulkUpdatedItem, BaseHistorizedItem, GeoItem, OwnPerms, def natural_key(self): return (self.external_id, ) - def get_values(self, prefix='', no_find=False): - values = super(BaseFind, self).get_values(prefix=prefix) + def get_values(self, prefix='', no_values=False, no_find=False): + values = super(BaseFind, self).get_values(prefix=prefix, + no_values=no_values) if no_find: return values values[prefix + "finds"] = [ - find.get_values(prefix=prefix, no_base_finds=True) + find.get_values(no_values=True, no_base_finds=True) for find in self.find.order_by('pk').all() ] return values @@ -640,10 +641,12 @@ class FindBasket(Basket, MainItem, ValueGetter): ("view_own_find", u"Can view own Find"), ) - def get_values(self, prefix=''): - values = super(FindBasket, self).get_values(prefix=prefix) + def get_values(self, prefix='', no_values=False): + values = super(FindBasket, self).get_values(prefix=prefix, + no_values=no_values) values[prefix + "items"] = [ - item.get_values() for item in self.items.distinct().all() + item.get_values(no_values=True) + for item in self.items.distinct().all() ] return values @@ -1597,12 +1600,13 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, QRCodeItem, return return self.base_finds.order_by('-pk').all()[0] - def get_values(self, prefix='', no_base_finds=False): - values = super(Find, self).get_values(prefix=prefix) + def get_values(self, prefix='', no_values=False, no_base_finds=False): + values = super(Find, self).get_values(prefix=prefix, + no_values=no_values) if no_base_finds: return values values[prefix + "base_finds"] = [ - base_find.get_values(prefix=prefix, no_find=True) + base_find.get_values(no_values=True, no_find=True) for base_find in self.base_finds.distinct().order_by('-pk').all() ] return values diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py index 6f24e1474..c35d3710c 100644 --- a/archaeological_finds/models_treatments.py +++ b/archaeological_finds/models_treatments.py @@ -312,8 +312,9 @@ class Treatment(DashboardFormItem, ValueGetter, BaseHistorizedItem, ] return actions - def get_values(self, prefix=''): - values = super(Treatment, self).get_values(prefix=prefix) + def get_values(self, prefix='', no_values=False): + values = super(Treatment, self).get_values(prefix=prefix, + no_values=no_values) values[prefix + "upstream_finds"] = u" ; ".join( [unicode(up) for up in self.upstream.all()]) values[prefix + "downstream_finds"] = u" ; ".join( @@ -324,7 +325,8 @@ class Treatment(DashboardFormItem, ValueGetter, BaseHistorizedItem, find = self.upstream.all()[0] if 'associatedfind_' not in prefix: values.update( - find.get_values(prefix=prefix + 'associatedfind_')) + find.get_values(prefix=prefix + 'associatedfind_', + no_values=True)) return values def pre_save(self): |