diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-02-11 03:49:50 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-02-11 03:49:50 +0100 |
| commit | a9b5d4dff598de052156c8586edac500aca8fede (patch) | |
| tree | 4b5d5239772666448740fbf21dc00bb59549a130 /ishtar/furnitures/models.py | |
| parent | 107463ea683b02c90a090fab65c8803383b9596a (diff) | |
| download | Ishtar-a9b5d4dff598de052156c8586edac500aca8fede.tar.bz2 Ishtar-a9b5d4dff598de052156c8586edac500aca8fede.zip | |
Modification of archaelogical file's admin act (refs #141)
Diffstat (limited to 'ishtar/furnitures/models.py')
| -rw-r--r-- | ishtar/furnitures/models.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index 3112d00f6..e476c639a 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -652,6 +652,10 @@ class ActType(GeneralType): verbose_name_plural = _(u"Act types") class AdministrativeAct(BaseHistorizedItem, OwnPerms): + TABLE_COLS = ['act_type', 'associated_file', 'associated_file.towns', + 'operation.towns'] + TABLE_COLS_FILE = ['act_type', 'associated_file', 'associated_file__towns',] + TABLE_COLS_OPE = ['act_type', 'ope__towns', 'operation__towns'] act_type = models.ForeignKey(ActType, verbose_name=_(u"Act type")) in_charge = models.ForeignKey(Person, blank=True, null=True, related_name='+', verbose_name=_(u"Person in charge of the operation")) @@ -682,7 +686,9 @@ related_name='+', verbose_name=_(u"Person in charge of the scientific part")) ) def __unicode__(self): - return self.operation + u" - " + self.fact_object + return u" - ".join([unicode(item) + for item in [self.operation, self.associated_file, self.act_object] + if item]) class ContainerType(GeneralType): lenght = models.IntegerField(_(u"Lenght")) |