diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2014-11-06 16:42:50 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2014-11-06 16:42:50 +0100 |
| commit | 6f48ac19e36bbd7d618e60c2ed77ab1c5363c054 (patch) | |
| tree | ceb1d5056ab27b3188501bd3be8e53e7326dea59 | |
| parent | 28089e9f73809f43523f2ef52f44c417feafeb80 (diff) | |
| download | Ishtar-6f48ac19e36bbd7d618e60c2ed77ab1c5363c054.tar.bz2 Ishtar-6f48ac19e36bbd7d618e60c2ed77ab1c5363c054.zip | |
Fix admin act ordering (closes #2052)
| -rw-r--r-- | archaeological_files/models.py | 4 | ||||
| -rw-r--r-- | archaeological_operations/models.py | 2 | ||||
| -rw-r--r-- | ishtar_common/models.py | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/archaeological_files/models.py b/archaeological_files/models.py index f0159b902..0c18af090 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -82,12 +82,12 @@ class File(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem, general_contractor = models.ForeignKey(Person, related_name='general_contractor', verbose_name=_(u"General contractor"), blank=True, null=True, - on_delete=models.SET_NULL,) + on_delete=models.SET_NULL,) # aménageur responsible_town_planning_service = models.ForeignKey(Person, related_name='responsible_town_planning_service', blank=True, null=True, verbose_name=_(u"Responsible for town planning service"), - on_delete=models.SET_NULL,) + on_delete=models.SET_NULL,) # service instructeur permit_type = models.ForeignKey(PermitType, verbose_name=_(u"Permit type"), blank=True, null=True) permit_reference = models.CharField(_(u"Permit reference"), diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index b4ff1809f..ffa585036 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -532,7 +532,7 @@ if FILES_AVAILABLE: _prefix = 'adminact_' class Meta: - ordering = ('year', 'index', 'act_type') + ordering = ('year', 'signature_date', 'index', 'act_type') verbose_name = _(u"Administrative act") verbose_name_plural = _(u"Administrative acts") permissions = ( diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 6c4ec2e49..b6262278b 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -866,6 +866,7 @@ class Person(Address, OwnPerms, ValueGetter) : _prefix = 'person_' TYPE = (('Mr', _(u'Mr')), ('Ms', _(u'Miss')), + ('Mr and Miss', _(u'Mr and Miss')), ('Md', _(u'Mrs')), ('Dr', _(u'Doctor')), ) |