Skip to content

Commit

Permalink
Merge pull request PyAr#277 from btenaglia/issue_275
Browse files Browse the repository at this point in the history
Cambio de orden en los eventos. issue 275
  • Loading branch information
mgaitan committed May 24, 2015
2 parents 71d49bd + 8557057 commit 3cb52d4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion events/templatetags/event_tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ def next_events():
events = Event.objects.filter(
end_at__gte=timezone.now()
).order_by(
'-updated_at'
'start_at'
)
return {'events': events}
4 changes: 2 additions & 2 deletions events/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ def author_name(self, item):

class EventList(ListView):
queryset = Event.objects.filter(
end_at__lt=timezone.now()).order_by('-updated_at')
end_at__lt=timezone.now()).order_by('-start_at')
paginate_by = 5
context_object_name = "eventos_pasados"

def get_context_data(self, **kwargs):
context = super(EventList, self).get_context_data(**kwargs)
context['eventos_proximos'] = Event.objects.filter(
end_at__gte=timezone.now()).order_by('-updated_at')
end_at__gte=timezone.now()).order_by('start_at')

return context

Expand Down

0 comments on commit 3cb52d4

Please sign in to comment.