diff --git a/mamweb/settings_local.py b/mamweb/settings_local.py index 6941c9aa..a11617d0 100644 --- a/mamweb/settings_local.py +++ b/mamweb/settings_local.py @@ -24,6 +24,7 @@ INSTALLED_APPS += ( # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True +INTERNAL_IPS = ['127.0.0.1'] TEMPLATES[0]['OPTIONS']['debug'] = True diff --git a/mamweb/urls.py b/mamweb/urls.py index b60c496a..6294fac4 100644 --- a/mamweb/urls.py +++ b/mamweb/urls.py @@ -1,5 +1,4 @@ from django.urls import path, include -from django.conf.urls.i18n import i18n_patterns from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django.contrib import admin from django.conf import settings @@ -9,30 +8,32 @@ from django.urls import path # As per docs. urlpatterns = [ - # Admin a nastroje - path('admin/', admin.site.urls), # NOQA - path('ckeditor/', include('ckeditor_uploader.urls')), - path('autocomplete/', include('autocomplete_light.urls')), + # Admin a nastroje + path('admin/', admin.site.urls), # NOQA + path('ckeditor/', include('ckeditor_uploader.urls')), + path('autocomplete/', include('autocomplete_light.urls')), - # Seminarova aplikace (ma vlastni podadresare) - path('', include('seminar.urls')), - - # Korekturovaci aplikace (ma vlastni podadresare) - path('', include('korektury.urls')), - - # Prednaskova aplikace (ma vlastni podadresare) - path('', include('prednasky.urls')), + # Seminarova aplikace (ma vlastni podadresare) + path('', include('seminar.urls')), + + # Korekturovaci aplikace (ma vlastni podadresare) + path('', include('korektury.urls')), + + # Prednaskova aplikace (ma vlastni podadresare) + path('', include('prednasky.urls')), - # Comments (interni i verejne) - path('comments_dj/', include('django_comments.urls')), - path('comments_fl/', include('fluent_comments.urls')), + # Comments (interni i verejne) + path('comments_dj/', include('django_comments.urls')), + path('comments_fl/', include('fluent_comments.urls')), ] # This is only needed when using runserver. if settings.DEBUG: - urlpatterns += [ - path('media/', views.static.serve, # NOQA - {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), - ] - urlpatterns += staticfiles_urlpatterns() + import debug_toolbar + urlpatterns += [ + path('media/', views.static.serve, # NOQA + {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), + path('__debug__/', include(debug_toolbar.urls)), + ] + urlpatterns += staticfiles_urlpatterns() diff --git a/requirements.txt b/requirements.txt index 3c38375b..0b73a6d4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -28,13 +28,13 @@ django-imagekit # Comments akismet==1.0.1 -django-fluent-comments==2.0.2 +django-fluent-comments==2.1 django-threadedcomments==1.2 django-contrib-comments==1.9.0 # debug tools/extensions -django-debug-toolbar==1.9.1 +django-debug-toolbar==1.11 django-extensions==2.1.9 sqlparse==0.2.4 Werkzeug==0.14.1 diff --git a/seminar/templates/seminar/soustredeni/maily_ucastniku.txt b/seminar/templates/seminar/soustredeni/maily_ucastniku.txt index 8060ce2a..74c25c91 100644 --- a/seminar/templates/seminar/soustredeni/maily_ucastniku.txt +++ b/seminar/templates/seminar/soustredeni/maily_ucastniku.txt @@ -1 +1 @@ -{% for sous_ucast in object_list %}{{ sous_ucast.resitel.email }}{% if not forloop.last %}, {% endif %}{% endfor %} +{% for sous_ucast in object_list %}{{ sous_ucast.resitel.osoba.email }}{% if not forloop.last %}, {% endif %}{% endfor %} diff --git a/seminar/views.py b/seminar/views.py index d55a4d0c..7ac0701e 100644 --- a/seminar/views.py +++ b/seminar/views.py @@ -631,7 +631,7 @@ def soustredeniUcastniciExportView(request,soustredeni): writer = csv.writer(response) writer.writerow(["jmeno", "prijmeni", "rok_maturity", "telefon", "email", "ulice", "mesto", "psc","stat"]) for u in ucastnici: - writer.writerow([u.jmeno, u.prijmeni, str(u.rok_maturity), u.telefon, u.email, u.ulice, u.mesto, u.psc, u.stat.name]) + writer.writerow([u.osoba.jmeno, u.osoba.prijmeni, str(u.rok_maturity), u.osoba.telefon, u.osoba.email, u.osoba.ulice, u.osoba.mesto, u.osoba.psc, u.osoba.stat.name]) return response