diff --git a/pgweb/core/views.py b/pgweb/core/views.py index 7a56a3e1..5de63c03 100644 --- a/pgweb/core/views.py +++ b/pgweb/core/views.py @@ -33,7 +33,7 @@ from profserv.models import ProfessionalService @cache(minutes=10) def home(request): news = NewsArticle.objects.filter(approved=True)[:5] - events = Event.objects.select_related('country').filter(approved=True, training=False, enddate__gt=date.today).order_by('startdate')[:3] + events = Event.objects.select_related('country').filter(approved=True, training=False, enddate__gt=date.today).order_by('-startdate')[:3] quote = Quote.objects.filter(approved=True).order_by('?')[0] versions = Version.objects.all() planet = ImportedRSSItem.objects.filter(feed__internalname="planet").order_by("-posttime")[:5] diff --git a/pgweb/events/views.py b/pgweb/events/views.py index 3cdcfdab..f47ca535 100644 --- a/pgweb/events/views.py +++ b/pgweb/events/views.py @@ -13,8 +13,8 @@ from models import Event from forms import EventForm def archive(request, paging=None): - events = Event.objects.select_related('country').filter(approved=True).filter(training=False, enddate__gt=date.today).order_by('startdate', 'enddate',) - training = Event.objects.select_related('country').filter(approved=True).filter(training=True, enddate__gt=date.today).order_by('startdate', 'enddate',) + events = Event.objects.select_related('country').filter(approved=True).filter(training=False, enddate__gt=date.today).order_by('-startdate', '-enddate',) + training = Event.objects.select_related('country').filter(approved=True).filter(training=True, enddate__gt=date.today).order_by('-startdate', '-enddate',) return render_to_response('events/archive.html', { 'eventblocks': ( { 'name': 'Events', 'events': events, },