diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-04 21:44:27 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-04 21:44:27 +0100 |
| commit | 41402266b19c94f677c4f5deaba738766b8b1af3 (patch) | |
| tree | 9f64e921fc66bbe0938e17c1f5325b83c4ccb73b /archaeological_context_records/models.py | |
| parent | b7b200e4ba1c54d83bbda5c47c9e96ddb36bbc0d (diff) | |
| parent | c5584da2f1842ff4b593fa78a2f524bcddb86d60 (diff) | |
| download | Ishtar-41402266b19c94f677c4f5deaba738766b8b1af3.tar.bz2 Ishtar-41402266b19c94f677c4f5deaba738766b8b1af3.zip | |
Merge branch 'master' into master-importers
Conflicts:
ishtar_common/fixtures/initial_importtypes-fr.json
Diffstat (limited to 'archaeological_context_records/models.py')
| -rw-r--r-- | archaeological_context_records/models.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 75074c514..9714673e6 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -44,8 +44,8 @@ post_delete.connect(post_save_cache, sender=DatingType) class DatingQuality(GeneralType): class Meta: - verbose_name = _(u"Dating quality") - verbose_name_plural = _(u"Dating qualities") + verbose_name = _(u"Dating quality type") + verbose_name_plural = _(u"Dating quality types") ordering = ('label',) post_save.connect(post_save_cache, sender=DatingQuality) post_delete.connect(post_save_cache, sender=DatingQuality) @@ -82,7 +82,7 @@ class Unit(GeneralType): class Meta: verbose_name = _(u"Unit Type") verbose_name_plural = _(u"Unit Types") - ordering = ('order',) + ordering = ('order', 'label') def __unicode__(self): return self.label |