From 50bfd6b746cc3d6f6784df853fa21ccb1f58b54b Mon Sep 17 00:00:00 2001 From: Baryshnikov Nikolay Date: Fri, 10 Feb 2017 15:10:42 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?= =?UTF-8?q?=D0=B0=D1=8F=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=BF?= =?UTF-8?q?=D0=BE=20=D0=B0=D0=B4=D0=BC=D0=B8=D0=BD=D0=BA=D0=B5=20=D0=B8=20?= =?UTF-8?q?=D0=BE=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _utils/open_lesson.py | 2 +- finance/admin.py | 7 ++++--- templates/auth_modals.html | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/_utils/open_lesson.py b/_utils/open_lesson.py index 30ed6c9..eac6539 100644 --- a/_utils/open_lesson.py +++ b/_utils/open_lesson.py @@ -11,7 +11,7 @@ django.setup() from journals.models import CourseMap, LessonJ, TeacherJ, HomeworkTry from lms.tools import show_progress -_NEED_OPEN = LessonJ.objects.get(material__id='918', student__email='wies@1312s.ru') +_NEED_OPEN = LessonJ.objects.get(material__id='1154', student__email='rnet2005@gmail.com') _TEACHERJ_FILTER = {'progress__gte': 0} _TEACHERJ_EXCLUDE = {'teacher': None} diff --git a/finance/admin.py b/finance/admin.py index 5643924..c638214 100644 --- a/finance/admin.py +++ b/finance/admin.py @@ -1,3 +1,4 @@ +# coding=utf-8 from django.contrib import admin from django.http import HttpResponse @@ -84,16 +85,16 @@ admin.site.register(Bill, BillAdmin) class ServiceRequestAdmin(admin.ModelAdmin): list_display = ('get_lead_name', 'get_client_name', 'date', 'send', 'send_date', 'host', ) - list_filter = ('send', 'company', 'service', 'host', 'send_date',) + list_filter = ('send', 'company', 'service', 'host', 'send_date', ) search_fields = ['lead_name', 'email', 'phone', 'name', 'host'] admin.site.register(ServiceRequest, ServiceRequestAdmin) class PriceAdmin(admin.ModelAdmin): - list_display = ('title', 'course', 'cost', 'public', 'key', 'url', 'freepay', ) + list_display = ('title', 'course', 'cost', 'public', 'key', 'freepay', ) filter_horizontal = ['included'] - list_filter = ['freepay'] + list_filter = ['freepay', 'service__course',] admin.site.register(Price, PriceAdmin) diff --git a/templates/auth_modals.html b/templates/auth_modals.html index 20f66b1..39310a4 100644 --- a/templates/auth_modals.html +++ b/templates/auth_modals.html @@ -384,7 +384,7 @@
  • стажировка
  • трудоустройство
  • общение с преподавателем
  • -
  • работа над реальными проктами
  • +
  • работа над реальными проектами