diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2013-04-30 10:45:14 +0000 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2013-04-30 10:45:14 +0000 |
| commit | 670e4c633a4fc0d66d10ac6e88b27ff6fb494328 (patch) | |
| tree | 53e045e9f05bc0e0252dbf059def75d26f3710ae /archaeological_files/models.py | |
| parent | 62d3eae1706a6bde8b0437ef765cf31983a88540 (diff) | |
| parent | 7436163934fcfc94c69fc97bd70466b251fbba77 (diff) | |
| download | Ishtar-670e4c633a4fc0d66d10ac6e88b27ff6fb494328.tar.bz2 Ishtar-670e4c633a4fc0d66d10ac6e88b27ff6fb494328.zip | |
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
Diffstat (limited to 'archaeological_files/models.py')
| -rw-r--r-- | archaeological_files/models.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/archaeological_files/models.py b/archaeological_files/models.py index 0caa8e55f..1bcaa2ced 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -59,13 +59,15 @@ class File(BaseHistorizedItem, OwnPerms): 'file_type', 'saisine_type', 'towns', ] year = models.IntegerField(_(u"Year"), default=lambda:datetime.datetime.now().year) - numeric_reference = models.IntegerField(_(u"Numeric reference")) - internal_reference = models.CharField(_(u"Internal reference"), - max_length=60, unique=True) + numeric_reference = models.IntegerField(_(u"Numeric reference"), blank=True, + null=True) + internal_reference = models.CharField(_(u"Internal reference"), blank=True, + null=True, max_length=60, unique=True) name = models.CharField(_(u"Name"), max_length=100, blank=True, null=True) file_type = models.ForeignKey(FileType, verbose_name=_(u"File type")) in_charge = models.ForeignKey(Person, related_name='+', - verbose_name=_(u"Person in charge")) + verbose_name=_(u"Person in charge"), + blank=True, null=True) general_contractor = models.ForeignKey(Person, related_name='+', verbose_name=_(u"General contractor"), blank=True, null=True) town_planning_service = models.ForeignKey(Organization, related_name='+', @@ -129,7 +131,7 @@ class File(BaseHistorizedItem, OwnPerms): if self.towns.count() == 1: items[0] = unicode(self.towns.all()[0]) items.append("-".join((unicode(self.year), - unicode(self.numeric_reference)))) + unicode(self.numeric_reference or '0')))) items += [unicode(getattr(self, k))[:36] for k in ['internal_reference',] if getattr(self, k)] return settings.JOINT.join(items) |