From f55377c5bfdf172103920763ee84e99b3b62d7b3 Mon Sep 17 00:00:00 2001 From: Anastasia Date: Tue, 7 Jul 2015 15:09:03 +0500 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=20?= =?UTF-8?q?=D1=81=D0=BF=D0=BE=D1=81=D0=BE=D0=B1=20=D0=BE=D1=82=D0=BE=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=8D=D1=81=D0=BA?= =?UTF-8?q?=D0=B8=D0=B7=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- asuzr/tables.py | 2 +- asuzr/views.py | 6 +++--- templates/asuzr/sketches.html | 12 +++++++++++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/asuzr/tables.py b/asuzr/tables.py index 34bf073..d9b1a8f 100644 --- a/asuzr/tables.py +++ b/asuzr/tables.py @@ -126,7 +126,7 @@ class SketchesTable(tables.Table): (reverse('asuzr.views.delete_sketch'), escape(record.id))) class Meta: - empty_text = 'Эскизов для этого заказа пока нет' + empty_text = 'Эскизов для этого заказа нет' attrs = {'class': 'paleblue'} class VisitTable(tables.Table): diff --git a/asuzr/views.py b/asuzr/views.py index cb60329..50af453 100644 --- a/asuzr/views.py +++ b/asuzr/views.py @@ -199,11 +199,11 @@ def sketches(request, order_id): instance.save() return redirect(sketches, order_id = order_id) - table = SketchesTable(Sketch.objects.filter(order = curr_order)) - RequestConfig(request).configure(table) + sketch_list = Sketch.objects.filter(order = curr_order) + #RequestConfig(request).configure(table) return render(request, 'asuzr/sketches.html', { 'order_id': order_id, - 'table': table, + 'sketch_list': sketch_list, 'title': 'Эскизы заказа %s' % curr_order}) def delete_sketch(request): diff --git a/templates/asuzr/sketches.html b/templates/asuzr/sketches.html index 593510f..f7d2c10 100644 --- a/templates/asuzr/sketches.html +++ b/templates/asuzr/sketches.html @@ -1,4 +1,14 @@ -{% extends "asuzr/table.html" %} +{% extends "asuzr/base.html" %} +{% load thumbnail %} +{% block page %} + {% if sketch_list %} + + {% endif %} +{% endblock %} {% block additional %}