summaryrefslogtreecommitdiff
path: root/ishtar/furnitures/models.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2011-03-28 19:26:49 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2011-03-28 19:26:49 +0200
commit9eeb4176592e55dcef8c1850621daf99171f2b1c (patch)
tree066bf7bc17be35b46060fc8428a6215674988b5c /ishtar/furnitures/models.py
parent9de739f126248c9fa0e45209740613432fd4eb20 (diff)
downloadIshtar-9eeb4176592e55dcef8c1850621daf99171f2b1c.tar.bz2
Ishtar-9eeb4176592e55dcef8c1850621daf99171f2b1c.zip
Adjust context record selection (closes #312)
Diffstat (limited to 'ishtar/furnitures/models.py')
-rw-r--r--ishtar/furnitures/models.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py
index d3269a69d..fdb8003c1 100644
--- a/ishtar/furnitures/models.py
+++ b/ishtar/furnitures/models.py
@@ -670,7 +670,14 @@ class BaseItem(BaseHistorizedItem, OwnPerms):
return self.label
class Item(BaseHistorizedItem, OwnPerms):
- TABLE_COLS = ['label', 'dating.period', 'material_type',]
+ TABLE_COLS = ['base_items.context_record.parcel.town',
+ 'base_items.context_record.parcel.operation.year',
+ 'base_items.context_record.parcel.operation.operation_code',
+ 'label', 'material_type', 'dating.period',
+ 'base_items.is_isolated']
+ if settings.COUNTRY == 'fr':
+ TABLE_COLS.insert(1,
+ 'base_items.context_record.parcel.operation.code_patriarche')
base_items = models.ManyToManyField(BaseItem, verbose_name=_(u"Base item"),
related_name='item')
order = models.IntegerField(_(u"Order"))