diff options
| author | Akshen | 2018-03-14 15:12:27 +0530 |
|---|---|---|
| committer | GitHub | 2018-03-14 15:12:27 +0530 |
| commit | 583f72a1dcbd9955134ea91d3fe2f556863f4be8 (patch) | |
| tree | 263d4b1256a667cbc6967492fdc620ee28c1ab5f | |
| parent | 5f130633f396e8b1dcc6cba92fab878edd077001 (diff) | |
| parent | 9020d03e5ab127d6c27bf59a15f4ee3bb5472478 (diff) | |
| download | workshop_booking-583f72a1dcbd9955134ea91d3fe2f556863f4be8.tar.gz workshop_booking-583f72a1dcbd9955134ea91d3fe2f556863f4be8.tar.bz2 workshop_booking-583f72a1dcbd9955134ea91d3fe2f556863f4be8.zip | |
Merge pull request #47 from Akshen/develop
Add email_id header in download profile_data option
| -rw-r--r-- | workshop_app/admin.py | 4 | ||||
| -rw-r--r-- | workshop_portal/settings.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/workshop_app/admin.py b/workshop_app/admin.py index 40d496f..1b7ae9d 100644 --- a/workshop_app/admin.py +++ b/workshop_app/admin.py @@ -26,12 +26,12 @@ class ProfileAdmin(admin.ModelAdmin): filename=profile_data.csv' writer = csv.writer(response) - writer.writerow(['title','username', 'first_name', 'last_name', + writer.writerow(['email_id', 'title','username', 'first_name', 'last_name', 'institute', 'location', 'department', 'phone_number', 'position']) for q in queryset: - writer.writerow([q.title, q.user, q.user.first_name, + writer.writerow([q.user.email, q.title, q.user, q.user.first_name, q.user.last_name, q.institute, q.location, q.department, q.phone_number, q.position]) diff --git a/workshop_portal/settings.py b/workshop_portal/settings.py index 9451a1f..65c514f 100644 --- a/workshop_portal/settings.py +++ b/workshop_portal/settings.py @@ -165,8 +165,7 @@ EMAIL_USE_TLS = EMAIL_USE_TLS EMAIL_TIMEOUT = 300 SENDER_EMAIL = SENDER_EMAIL - -EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' +#EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' #Change this to the production url PRODUCTION_URL = 'your_production_url' |