diff options
| -rw-r--r-- | archaeological_context_records/models.py | 5 | ||||
| -rw-r--r-- | archaeological_files/models.py | 3 | ||||
| -rw-r--r-- | archaeological_finds/models.py | 2 | ||||
| -rw-r--r-- | archaeological_operations/models.py | 2 | ||||
| -rw-r--r-- | archaeological_warehouse/models.py | 2 | ||||
| -rw-r--r-- | ishtar_common/models.py | 2 |
6 files changed, 16 insertions, 0 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index d138977bc..0a970b8ce 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -29,11 +29,13 @@ class DatingType(GeneralType): class Meta: verbose_name = _(u"Dating type") verbose_name_plural = _(u"Dating types") + ordering = ('label',) class DatingQuality(GeneralType): class Meta: verbose_name = _(u"Dating quality") verbose_name_plural = _(u"Dating qualities") + ordering = ('label',) class Dating(models.Model): period = models.ForeignKey(Period, verbose_name=_(u"Period")) @@ -63,6 +65,7 @@ class Unit(GeneralType): class Meta: verbose_name = _(u"Type Unit") verbose_name_plural = _(u"Types Unit") + ordering = ('order',) def __unicode__(self): return self.label @@ -73,6 +76,7 @@ class ActivityType(GeneralType): class Meta: verbose_name = _(u"Type Activity") verbose_name_plural = _(u"Types Activity") + ordering = ('order',) def __unicode__(self): return self.label @@ -82,6 +86,7 @@ class IdentificationType(GeneralType): class Meta: verbose_name = _(u"Type Identification") verbose_name_plural = _(u"Types Identification") + ordering = ('order',) def __unicode__(self): return self.label diff --git a/archaeological_files/models.py b/archaeological_files/models.py index 49b9086d0..0095dd13b 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -35,6 +35,7 @@ class FileType(GeneralType): class Meta: verbose_name = _(u"Archaeological file type") verbose_name_plural = _(u"Archaeological file types") + ordering = ('label',) @classmethod def is_preventive(cls, file_type_id, key=''): @@ -49,6 +50,7 @@ class PermitType(GeneralType): class Meta: verbose_name = _(u"Permit type") verbose_name_plural = _(u"Permit types") + ordering = ('label',) if settings.COUNTRY == 'fr': class SaisineType(GeneralType): @@ -56,6 +58,7 @@ if settings.COUNTRY == 'fr': class Meta: verbose_name = u"Type Saisine" verbose_name_plural = u"Types Saisine" + ordering = ('label',) class File(BaseHistorizedItem, OwnPerms): TABLE_COLS = ['numeric_reference', 'year', 'internal_reference', diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py index 84a041a41..c832fdf70 100644 --- a/archaeological_finds/models.py +++ b/archaeological_finds/models.py @@ -40,6 +40,7 @@ class MaterialType(GeneralType): class Meta: verbose_name = _(u"Material type") verbose_name_plural = _(u"Material types") + ordering = ('label',) class BaseFind(BaseHistorizedItem, OwnPerms): label = models.CharField(_(u"ID"), max_length=60) @@ -293,6 +294,7 @@ class TreatmentType(GeneralType): class Meta: verbose_name = _(u"Treatment type") verbose_name_plural = _(u"Treatment types") + ordering = ('label',) class Treatment(BaseHistorizedItem, OwnPerms): container = models.ForeignKey(Container, verbose_name=_(u"Container"), diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 3924249c0..c805f9a3d 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -56,6 +56,7 @@ class RemainType(GeneralType): class Meta: verbose_name = _(u"Remain type") verbose_name_plural = _(u"Remain types") + ordering = ('label',) class Period(GeneralType) : order = models.IntegerField(_(u"Order")) @@ -317,6 +318,7 @@ class ActType(GeneralType): class Meta: verbose_name = _(u"Act type") verbose_name_plural = _(u"Act types") + ordering = ('label',) class AdministrativeAct(BaseHistorizedItem, OwnPerms): TABLE_COLS = ['act_type', 'associated_file', 'operation', diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 4e583d22c..1c8849f41 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -29,6 +29,7 @@ class WarehouseType(GeneralType): class Meta: verbose_name = _(u"Warehouse type") verbose_name_plural = _(u"Warehouse types") + ordering = ('label',) class Warehouse(Address, OwnPerms): name = models.CharField(_(u"Name"), max_length=40) @@ -62,6 +63,7 @@ class ContainerType(GeneralType): class Meta: verbose_name = _(u"Container type") verbose_name_plural = _(u"Container types") + ordering = ('label',) class Container(LightHistorizedItem): TABLE_COLS = ['reference', 'container_type', 'location',] diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 6eca7ddd7..456368d6e 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -619,6 +619,7 @@ class OrganizationType(GeneralType): class Meta: verbose_name = _(u"Organization type") verbose_name_plural = _(u"Organization types") + ordering = ('label',) class Organization(Address, OwnPerms): name = models.CharField(_(u"Name"), max_length=100) @@ -644,6 +645,7 @@ class PersonType(GeneralType): class Meta: verbose_name = _(u"Person type") verbose_name_plural = _(u"Person types") + ordering = ('label',) class Person(Address, OwnPerms) : TYPE = (('Mr', _(u'Mr')), |