From 4a2e2ddc7b12924f505c0e35dda806ad019e459b Mon Sep 17 00:00:00 2001 From: Michael Elkins Date: Thu, 13 Jun 2013 18:22:43 +0000 Subject: handle exception thrown when there are no matching routes to display see #548 svn path=/trunk/; revision=5401 --- rpkid/rpki/gui/app/views.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'rpkid') diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py index 40bb3d02..3640d160 100644 --- a/rpkid/rpki/gui/app/views.py +++ b/rpkid/rpki/gui/app/views.py @@ -36,7 +36,7 @@ from django import http from django.core.urlresolvers import reverse, reverse_lazy from django.contrib.auth.models import User from django.views.generic import DetailView, ListView, DeleteView -from django.core.paginator import Paginator +from django.core.paginator import Paginator, InvalidPage from django.forms.formsets import formset_factory, BaseFormSet import django.db.models from django.contrib import messages @@ -946,7 +946,11 @@ def route_view(request): page = request.GET.get('page', 1) paginator = Paginator(conf.routes, count) - routes = paginator.page(page) + try: + routes = paginator.page(page) + except InvalidPage: + # page was empty, or page number was invalid + routes = [] ts = dict((attr['name'], attr['ts']) for attr in models.Timestamp.objects.values()) return render(request, 'app/routes_view.html', {'routes': routes, 'timestamp': ts}) -- cgit v1.2.3