diff options
| -rw-r--r-- | askbot/models/tag.py | 7 | ||||
| -rw-r--r-- | askbot/views/readers.py | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/askbot/models/tag.py b/askbot/models/tag.py index 213da4f7..fe92e283 100644 --- a/askbot/models/tag.py +++ b/askbot/models/tag.py @@ -97,7 +97,7 @@ class TagQuerySet(models.query.QuerySet): search query is the most common - just return a list of top tags""" cheating = True - tags = Tag.objects.all().order_by('-used_count') + tags = Tag.objects.all().order_by('name') else: cheating = False #getting id's is necessary to avoid hitting a heavy query @@ -117,7 +117,8 @@ class TagQuerySet(models.query.QuerySet): tags = tags.exclude(deleted = True) - tags = tags[:50]#magic number + #tags = tags[:50]#magic number + if cheating: for tag in tags: tag.local_used_count = tag.used_count @@ -142,7 +143,7 @@ class Tag(DeletableContent): class Meta(DeletableContent.Meta): db_table = u'tag' - ordering = ('name','-used_count') + ordering = ('-used_count', 'name') def __unicode__(self): return self.name diff --git a/askbot/views/readers.py b/askbot/views/readers.py index 6b30fc32..27d6d1f5 100644 --- a/askbot/views/readers.py +++ b/askbot/views/readers.py @@ -312,7 +312,7 @@ def tags(request):#view showing a listing of available tags - plain list if request.method == "GET": stag = request.GET.get("query", "").strip() if stag != '': - tags = .objects.filter(deleted=False, name__icontains=stag).exclude(used_count=0) + tags = models.Tag.objects.filter(deleted=False, name__icontains=stag).exclude(used_count=0) else: if sortby == "name": tags = models.Tag.objects.all().filter(deleted=False).exclude(used_count=0).order_by("name") |