mam/mamweb
13
1
Fork 0
Code Issues Pull requests 12 Projects Wiki Activity Actions

Merge branch 'data_migrations' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into data_migrations

Browse source
This commit is contained in:
Martin Z. (Zimamazim) 2019-06-20 23:02:22 +02:00
commit 05051d53e8
5 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mamweb/settings_local.py
View file

@ -24,6 +24,7 @@ INSTALLED_APPS += (
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True DEBUG = True
INTERNAL_IPS = ['127.0.0.1']
TEMPLATES[0]['OPTIONS']['debug'] = True TEMPLATES[0]['OPTIONS']['debug'] = True

43
mamweb/urls.py
View file

@ -1,5 +1,4 @@
from django.urls import path, include 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.staticfiles.urls import staticfiles_urlpatterns
from django.contrib import admin from django.contrib import admin
from django.conf import settings from django.conf import settings
@ -9,30 +8,32 @@ from django.urls import path # As per docs.
urlpatterns = [ urlpatterns = [
# Admin a nastroje # Admin a nastroje
path('admin/', admin.site.urls), # NOQA path('admin/', admin.site.urls), # NOQA
path('ckeditor/', include('ckeditor_uploader.urls')), path('ckeditor/', include('ckeditor_uploader.urls')),
path('autocomplete/', include('autocomplete_light.urls')), path('autocomplete/', include('autocomplete_light.urls')),
# Seminarova aplikace (ma vlastni podadresare) # Seminarova aplikace (ma vlastni podadresare)
path('', include('seminar.urls')), path('', include('seminar.urls')),
# Korekturovaci aplikace (ma vlastni podadresare) # Korekturovaci aplikace (ma vlastni podadresare)
path('', include('korektury.urls')), path('', include('korektury.urls')),
# Prednaskova aplikace (ma vlastni podadresare) # Prednaskova aplikace (ma vlastni podadresare)
path('', include('prednasky.urls')), path('', include('prednasky.urls')),
# Comments (interni i verejne) # Comments (interni i verejne)
path('comments_dj/', include('django_comments.urls')), path('comments_dj/', include('django_comments.urls')),
path('comments_fl/', include('fluent_comments.urls')), path('comments_fl/', include('fluent_comments.urls')),
] ]
# This is only needed when using runserver. # This is only needed when using runserver.
if settings.DEBUG: if settings.DEBUG:
urlpatterns += [ import debug_toolbar
path('media/<path:path>', views.static.serve, # NOQA urlpatterns += [
{'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), path('media/<path:path>', views.static.serve, # NOQA
] {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
urlpatterns += staticfiles_urlpatterns() path('__debug__/', include(debug_toolbar.urls)),
]
urlpatterns += staticfiles_urlpatterns()

4
requirements.txt
View file

@ -28,13 +28,13 @@ django-imagekit
# Comments # Comments
akismet==1.0.1 akismet==1.0.1
django-fluent-comments==2.0.2 django-fluent-comments==2.1
django-threadedcomments==1.2 django-threadedcomments==1.2
django-contrib-comments==1.9.0 django-contrib-comments==1.9.0
# debug tools/extensions # debug tools/extensions
django-debug-toolbar==1.9.1 django-debug-toolbar==1.11
django-extensions==2.1.9 django-extensions==2.1.9
sqlparse==0.2.4 sqlparse==0.2.4
Werkzeug==0.14.1 Werkzeug==0.14.1

2
seminar/templates/seminar/soustredeni/maily_ucastniku.txt
View file

@ -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 %}

2
seminar/views.py
View file

@ -631,7 +631,7 @@ def soustredeniUcastniciExportView(request,soustredeni):
writer = csv.writer(response) writer = csv.writer(response)
writer.writerow(["jmeno", "prijmeni", "rok_maturity", "telefon", "email", "ulice", "mesto", "psc","stat"]) writer.writerow(["jmeno", "prijmeni", "rok_maturity", "telefon", "email", "ulice", "mesto", "psc","stat"])
for u in ucastnici: 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 return response