From 07c6260bdeed9f64931c0df31d1a8a3fa6104b5e Mon Sep 17 00:00:00 2001 From: Shane Frischkorn Date: Tue, 21 Jan 2014 15:59:23 +1000 Subject: [PATCH] Sorted the order of the menu items --- three_d_viewer/models.py | 4 ++-- three_d_viewer/views.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/three_d_viewer/models.py b/three_d_viewer/models.py index 21c1a2d..5daca3d 100644 --- a/three_d_viewer/models.py +++ b/three_d_viewer/models.py @@ -34,11 +34,11 @@ class Category(CommonInfo): @property def active_children(self): - return self.children.filter(active=True) + return self.children.filter(active=True).order_by('name') @property def active_samples(self): - return self.samples.filter(active=True) + return self.samples.filter(active=True).order_by('name') class Sample(CommonInfo): diff --git a/three_d_viewer/views.py b/three_d_viewer/views.py index e54fd09..9b9d0b0 100644 --- a/three_d_viewer/views.py +++ b/three_d_viewer/views.py @@ -19,9 +19,9 @@ class HomeView(generic.ListView): def get_context_data(self, **kwargs): context = super(HomeView, self).get_context_data(**kwargs) - context['active_samples'] = Sample.objects.filter(active=True) + context['active_samples'] = Sample.objects.filter(active=True).order_by('name') context['parent_categories'] = Category.objects.filter(parent=None). \ - filter(active=True) + filter(active=True).order_by('name') return context @@ -33,11 +33,11 @@ class DetailView(generic.DetailView): model = Sample template_name = 'three_d_viewer/detail.html' parent_categories = Category.objects.filter(parent=None). \ - filter(active=True) + filter(active=True).order_by("name") def get_context_data(self, **kwargs): context = super(DetailView, self).get_context_data(**kwargs) - context['active_samples'] = Sample.objects.filter(active=True) + context['active_samples'] = Sample.objects.filter(active=True).order_by('name') context['parent_categories'] = Category.objects.filter(parent=None). \ - filter(active=True) + filter(active=True).order_by('name') return context