Небольшая правка по админке и опечатка

remotes/origin/pm_task_31703
Baryshnikov Nikolay 9 years ago
parent 66eea4b629
commit 50bfd6b746
  1. 2
      _utils/open_lesson.py
  2. 7
      finance/admin.py
  3. 2
      templates/auth_modals.html

@ -11,7 +11,7 @@ django.setup()
from journals.models import CourseMap, LessonJ, TeacherJ, HomeworkTry from journals.models import CourseMap, LessonJ, TeacherJ, HomeworkTry
from lms.tools import show_progress 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_FILTER = {'progress__gte': 0}
_TEACHERJ_EXCLUDE = {'teacher': None} _TEACHERJ_EXCLUDE = {'teacher': None}

@ -1,3 +1,4 @@
# coding=utf-8
from django.contrib import admin from django.contrib import admin
from django.http import HttpResponse from django.http import HttpResponse
@ -84,16 +85,16 @@ admin.site.register(Bill, BillAdmin)
class ServiceRequestAdmin(admin.ModelAdmin): class ServiceRequestAdmin(admin.ModelAdmin):
list_display = ('get_lead_name', 'get_client_name', 'date', 'send', 'send_date', 'host', ) 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'] search_fields = ['lead_name', 'email', 'phone', 'name', 'host']
admin.site.register(ServiceRequest, ServiceRequestAdmin) admin.site.register(ServiceRequest, ServiceRequestAdmin)
class PriceAdmin(admin.ModelAdmin): class PriceAdmin(admin.ModelAdmin):
list_display = ('title', 'course', 'cost', 'public', 'key', 'url', 'freepay', ) list_display = ('title', 'course', 'cost', 'public', 'key', 'freepay', )
filter_horizontal = ['included'] filter_horizontal = ['included']
list_filter = ['freepay'] list_filter = ['freepay', 'service__course',]
admin.site.register(Price, PriceAdmin) admin.site.register(Price, PriceAdmin)

@ -384,7 +384,7 @@
<li><i class="glyphicon glyphicon-ok-sign" style="color: green;"></i> стажировка</li> <li><i class="glyphicon glyphicon-ok-sign" style="color: green;"></i> стажировка</li>
<li><i class="glyphicon glyphicon-ok-sign" style="color: green;"></i> трудоустройство</li> <li><i class="glyphicon glyphicon-ok-sign" style="color: green;"></i> трудоустройство</li>
<li><i class="glyphicon glyphicon-ok-sign" style="color: green;"></i> общение с преподавателем</li> <li><i class="glyphicon glyphicon-ok-sign" style="color: green;"></i> общение с преподавателем</li>
<li><i class="glyphicon glyphicon-ok-sign" style="color: green;"></i> работа над реальными проктами</li> <li><i class="glyphicon glyphicon-ok-sign" style="color: green;"></i> работа над реальными проектами</li>
</ul> </ul>
</div> </div>

Loading…
Cancel
Save