diff options
| -rw-r--r-- | servo/templates/diagnostics/select_test.html | 2 | ||||
| -rwxr-xr-x | servo/templates/products/view.html | 10 | ||||
| -rw-r--r-- | servo/views/account.py | 16 |
3 files changed, 12 insertions, 16 deletions
diff --git a/servo/templates/diagnostics/select_test.html b/servo/templates/diagnostics/select_test.html index 95618f8..c296f10 100644 --- a/servo/templates/diagnostics/select_test.html +++ b/servo/templates/diagnostics/select_test.html @@ -3,7 +3,7 @@ {% block header %}{% trans "Choose test to run" %}{% endblock header %} {% block body %} {% if error %} - <h2>{{ error }}</h2> + <h3 class="empty muted">{{ error }}</h3> {% endif %} <ul class="nav nav-pills nav-stacked"> {% for i in tests %} diff --git a/servo/templates/products/view.html b/servo/templates/products/view.html index 7f5f355..f719ed5 100755 --- a/servo/templates/products/view.html +++ b/servo/templates/products/view.html @@ -158,10 +158,11 @@ <th>{% trans "Received" %}</th> </tr> </thead> + <tbody> {% for i in product.purchaseorderitem_set.all reversed %} <tr> {% with i.purchase_order as order %} - <td><a href="{{ order.get_absolute_url }}">{{ order.pk }}</a></td> + <td><a href="{{ order.get_absolute_url }}">{{ order.pk|safe }}</a></td> <td>{{ i.created_at|date:"SHORT_DATE_FORMAT" }}</td> <td>{{ i.price|currency }}</td> <td>{{ i.received_at|date:"SHORT_DATE_FORMAT" }}</td> @@ -170,6 +171,7 @@ {% empty %} <tr><td colspan="4" class="empty muted">{% trans "No Purchase Orders" %}</td></tr> {% endfor %} + </tbody> </table> </div> <div class="tab-pane" id="tab4"> @@ -182,9 +184,10 @@ <th>{% trans "Price" %}</th> </tr> </thead> + <tbody> {% for i in product.invoiceitem_set.all reversed %} <tr> - <td><a href="{{ i.invoice.get_absolute_url }}">{{ i.invoice.pk }}</a></td> + <td><a href="{{ i.invoice.get_absolute_url }}">{{ i.invoice.pk|safe }}</a></td> {% with i.invoice.order as order %} <td><a href="{{ order.get_absolute_url }}">{{ order.code }}</a></td> {% endwith %} @@ -194,6 +197,7 @@ {% empty %} <tr><td colspan="4" class="empty muted">{% trans "No invoices" %}</td></tr> {% endfor %} + </tbody> </table> </div> </div> @@ -201,5 +205,5 @@ {% endblock third_column %} {% block breadcrumb %} -<li class="active"><span class="divider">/</span>{{ product.title }}</li> + <li class="active"><span class="divider">/</span>{{ product.title }}</li> {% endblock breadcrumb %} diff --git a/servo/views/account.py b/servo/views/account.py index 8c782d1..4cbd6b4 100644 --- a/servo/views/account.py +++ b/servo/views/account.py @@ -11,12 +11,12 @@ from django.contrib import messages from django.http import QueryDict from django.http import HttpResponse from django.core.urlresolvers import reverse -from django.shortcuts import redirect, render from dateutil.relativedelta import relativedelta from django.utils.translation import ugettext as _ from django.contrib.auth.decorators import permission_required -from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger +from django.shortcuts import redirect, render, get_object_or_404 +from servo.lib.utils import paginate from servo.views.order import prepare_list_view from servo.models import Order, User, Calendar, CalendarEvent @@ -194,7 +194,7 @@ def prepare_calendar_view(request, pk, view, start_date): @permission_required("servo.add_calendar") def download_calendar(request, pk, view): - calendar = Calendar.objects.get(pk=pk) + calendar = get_object_or_404(Calendar, pk=pk) response = HttpResponse(content_type="text/csv") response['Content-Disposition'] = 'attachment; filename="%s.csv"' % calendar.title @@ -412,15 +412,7 @@ def updates(request): title = _('Updates') kind = request.GET.get('kind', 'note_added') events = request.user.notifications.filter(action=kind) - page = request.GET.get("page") - paginator = Paginator(events, 100) - - try: - events = paginator.page(page) - except PageNotAnInteger: - events = paginator.page(1) - except EmptyPage: - events = paginator.page(paginator.num_pages) + events = paginate(events, page, 100) return render(request, "accounts/updates.html", locals()) |