From 6e74eb2dfa043034d31f4fb87fa8e5be9e8c1fb7 Mon Sep 17 00:00:00 2001 From: "Denis V. Dedkov" Date: Wed, 30 Sep 2015 13:17:37 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=B0=D0=BB=D0=B5=D0=BD=D0=B4=D0=B0?= =?UTF-8?q?=D1=80=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Починил виджет календаря --- asuzr/views.py | 5 +++++ templates/asuzr/base.html | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/asuzr/views.py b/asuzr/views.py index 214b811..c8a1e37 100644 --- a/asuzr/views.py +++ b/asuzr/views.py @@ -14,6 +14,7 @@ from django.contrib.auth.decorators import login_required from asuzr.tables import * from asuzr.forms import * from django_tables2 import RequestConfig +from inplaceeditform.commons import get_admin_static_url @login_required def prod_list(request): @@ -122,6 +123,8 @@ def visit_view(request): order_form = OrderForm(initial = {'designer': request.user}) + request.ADMIN_MEDIA_PREFIX = get_admin_static_url() + title = u'Таблица посещаемости на %s' % dateformat.format(curr_date, 'F Y') return render(request, 'asuzr/table2.html', { 'table1': attendance_table, @@ -187,6 +190,7 @@ def desreport(request): title = u'Отчет по дизайнерам за '+' - '.join((start_date, end_date)) form = DiapDateForm({'sdate': sdate, 'edate': edate}) RequestConfig(request).configure(table) + request.ADMIN_MEDIA_PREFIX = get_admin_static_url() return render(request, 'asuzr/table.html', {'table': table, 'title': title, 'dateform': form}) @log_view_call @@ -238,6 +242,7 @@ def prod_plan_view(request): title = u'Производственный план на %s - %s' % (sdate.strftime('%d.%m.%Y'), edate.strftime('%d.%m.%Y')) date_form = DateForm({'date':curr_date}) add_form = ProdPlanForm() + request.ADMIN_MEDIA_PREFIX = get_admin_static_url() for table in tables: RequestConfig(request).configure(table) return render(request, 'asuzr/table_n.html', {'tables': tables, 'title': title, 'dateform': date_form, 'add_form': add_form, 'form_action' : 'add-plan-item'}) diff --git a/templates/asuzr/base.html b/templates/asuzr/base.html index 936b217..7ee0b01 100644 --- a/templates/asuzr/base.html +++ b/templates/asuzr/base.html @@ -8,6 +8,9 @@ {% inplace_static %} + + +
- {{ dateform }} + {{ dateform }}
{% endif %}