VladPolskiy/postgres-web
1
0
Fork 0
mirror of https://github.com/postgres/pgweb.git synced 2025-08-03 15:38:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-fix event sorting, we're supposed to sort by *end* date...

Browse Source
This commit is contained in:
Magnus Hagander
2010-06-10 19:08:30 +02:00
parent f95fccc836
commit 509e328d1d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pgweb/core/views.py
View File

@ -33,7 +33,7 @@ from profserv.models import ProfessionalService
@cache(minutes=10) @cache(minutes=10)
def home(request): def home(request):
news = NewsArticle.objects.filter(approved=True)[:5] 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('enddate', 'startdate')[:3]
quote = Quote.objects.filter(approved=True).order_by('?')[0] quote = Quote.objects.filter(approved=True).order_by('?')[0]
versions = Version.objects.all() versions = Version.objects.all()
planet = ImportedRSSItem.objects.filter(feed__internalname="planet").order_by("-posttime")[:5] planet = ImportedRSSItem.objects.filter(feed__internalname="planet").order_by("-posttime")[:5]

4
pgweb/events/views.py
View File

@ -13,8 +13,8 @@ from models import Event
from forms import EventForm from forms import EventForm
def archive(request, paging=None): 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',) events = Event.objects.select_related('country').filter(approved=True).filter(training=False, enddate__gt=date.today).order_by('enddate', 'startdate',)
training = Event.objects.select_related('country').filter(approved=True).filter(training=True, 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('enddate', 'startdate',)
return render_to_response('events/archive.html', { return render_to_response('events/archive.html', {
'eventblocks': ( 'eventblocks': (
{ 'name': 'Events', 'events': events, }, { 'name': 'Events', 'events': events, },