diff --git a/HISTORY.rst b/HISTORY.rst index 8643eb5a80..7d2f8bd330 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -10,6 +10,7 @@ - Add support logging request exceptions. - Add document list item view. - Sort setting by namespace label and by global name second. +- Sort indexes by label. 2.5.2 (2017-07-08) ================== diff --git a/mayan/apps/document_indexing/models.py b/mayan/apps/document_indexing/models.py index a785669604..27106b3557 100644 --- a/mayan/apps/document_indexing/models.py +++ b/mayan/apps/document_indexing/models.py @@ -51,6 +51,11 @@ class Index(models.Model): objects = IndexManager() + class Meta: + ordering = ('label',) + verbose_name = _('Index') + verbose_name_plural = _('Indexes') + def __str__(self): return self.label @@ -113,10 +118,6 @@ class Index(models.Model): # associated with this index. self.index_document(document=document) - class Meta: - verbose_name = _('Index') - verbose_name_plural = _('Indexes') - class IndexInstance(Index): def get_instance_node_count(self): @@ -173,6 +174,10 @@ class IndexTemplateNode(MPTTModel): verbose_name=_('Link documents') ) + class Meta: + verbose_name = _('Index node template') + verbose_name_plural = _('Indexes node template') + def __str__(self): if self.is_root_node(): return ugettext('Root') @@ -264,10 +269,6 @@ class IndexTemplateNode(MPTTModel): if acquire_lock: lock.release() - class Meta: - verbose_name = _('Index node template') - verbose_name_plural = _('Indexes node template') - @python_2_unicode_compatible class IndexInstanceNode(MPTTModel): @@ -286,6 +287,10 @@ class IndexInstanceNode(MPTTModel): objects = IndexInstanceNodeManager() + class Meta: + verbose_name = _('Index node instance') + verbose_name_plural = _('Indexes node instances') + def __str__(self): return self.value @@ -366,10 +371,6 @@ class IndexInstanceNode(MPTTModel): if acquire_lock: lock.release() - class Meta: - verbose_name = _('Index node instance') - verbose_name_plural = _('Indexes node instances') - class DocumentIndexInstanceNode(IndexInstanceNode): objects = DocumentIndexInstanceNodeManager()