diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-05 20:09:46 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-05 20:09:46 +0200 |
| commit | 6d53f660453552414207a711cef2cad2f09bf8d3 (patch) | |
| tree | da14d18d48ba4c5217f466ade0aad79c40bb3bca /archaeological_finds/models.py | |
| parent | 4190b4a7dc03c0b9f1ca4113b4d0706c1bfffa19 (diff) | |
| parent | edfe798c15c8589933cb41314d01ff73a8d7c0c8 (diff) | |
| download | Ishtar-6d53f660453552414207a711cef2cad2f09bf8d3.tar.bz2 Ishtar-6d53f660453552414207a711cef2cad2f09bf8d3.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_finds/models.py')
| -rw-r--r-- | archaeological_finds/models.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py index 70e0156fc..15ed32120 100644 --- a/archaeological_finds/models.py +++ b/archaeological_finds/models.py @@ -280,7 +280,9 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): 'base_finds.context_record.operation.year', 'base_finds.context_record.operation.operation_code', 'container.reference', 'container.location', - 'base_finds.batch'] + 'base_finds.batch', + 'base_finds.context_record.parcel.town', + 'base_finds.context_record.parcel', ] if settings.COUNTRY == 'fr': TABLE_COLS.insert( 6, 'base_finds.context_record.operation.code_patriarche') @@ -289,7 +291,9 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): 'base_finds.cache_complete_id', 'previous_id', 'label', 'material_types', 'datings.period', 'find_number', 'object_types', - 'description'] + 'description', + 'base_finds.context_record.parcel.town', + 'base_finds.context_record.parcel', ] EXTRA_FULL_FIELDS = [ 'base_finds.cache_short_id', 'base_finds.cache_complete_id', @@ -372,13 +376,7 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): null=True) history = HistoricalRecords() BASKET_MODEL = FindBasket - - def __init__(self, *args, **kwargs): - super(Find, self).__init__(*args, **kwargs) - image = self._meta.get_field_by_name("image")[0] - image.upload_to = "finds/" - thumbnail = self._meta.get_field_by_name("thumbnail")[0] - thumbnail.upload_to = "finds/thumbs/" + IMAGE_PREFIX = 'finds/' class Meta: verbose_name = _(u"Find") |