Sort indexes by label.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2017-07-13 21:34:43 -04:00
parent 32056761c8
commit eff548d2e8
2 changed files with 14 additions and 12 deletions

View File

@@ -10,6 +10,7 @@
- Add support logging request exceptions. - Add support logging request exceptions.
- Add document list item view. - Add document list item view.
- Sort setting by namespace label and by global name second. - Sort setting by namespace label and by global name second.
- Sort indexes by label.
2.5.2 (2017-07-08) 2.5.2 (2017-07-08)
================== ==================

View File

@@ -51,6 +51,11 @@ class Index(models.Model):
objects = IndexManager() objects = IndexManager()
class Meta:
ordering = ('label',)
verbose_name = _('Index')
verbose_name_plural = _('Indexes')
def __str__(self): def __str__(self):
return self.label return self.label
@@ -113,10 +118,6 @@ class Index(models.Model):
# associated with this index. # associated with this index.
self.index_document(document=document) self.index_document(document=document)
class Meta:
verbose_name = _('Index')
verbose_name_plural = _('Indexes')
class IndexInstance(Index): class IndexInstance(Index):
def get_instance_node_count(self): def get_instance_node_count(self):
@@ -173,6 +174,10 @@ class IndexTemplateNode(MPTTModel):
verbose_name=_('Link documents') verbose_name=_('Link documents')
) )
class Meta:
verbose_name = _('Index node template')
verbose_name_plural = _('Indexes node template')
def __str__(self): def __str__(self):
if self.is_root_node(): if self.is_root_node():
return ugettext('Root') return ugettext('Root')
@@ -264,10 +269,6 @@ class IndexTemplateNode(MPTTModel):
if acquire_lock: if acquire_lock:
lock.release() lock.release()
class Meta:
verbose_name = _('Index node template')
verbose_name_plural = _('Indexes node template')
@python_2_unicode_compatible @python_2_unicode_compatible
class IndexInstanceNode(MPTTModel): class IndexInstanceNode(MPTTModel):
@@ -286,6 +287,10 @@ class IndexInstanceNode(MPTTModel):
objects = IndexInstanceNodeManager() objects = IndexInstanceNodeManager()
class Meta:
verbose_name = _('Index node instance')
verbose_name_plural = _('Indexes node instances')
def __str__(self): def __str__(self):
return self.value return self.value
@@ -366,10 +371,6 @@ class IndexInstanceNode(MPTTModel):
if acquire_lock: if acquire_lock:
lock.release() lock.release()
class Meta:
verbose_name = _('Index node instance')
verbose_name_plural = _('Indexes node instances')
class DocumentIndexInstanceNode(IndexInstanceNode): class DocumentIndexInstanceNode(IndexInstanceNode):
objects = DocumentIndexInstanceNodeManager() objects = DocumentIndexInstanceNodeManager()