From ad3cd0d067dc31c300ac45c3526720b03b7dc82a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jordan=20Aug=C3=A9?= <jordan.auge@lip6.fr>
Date: Wed, 3 Jul 2013 15:48:21 +0200
Subject: [PATCH] updated mail configuration in settings
---
myslice/settings.py | 5 +++++
portal/urls.py | 12 ++++++------
portal/views.py | 2 +-
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/myslice/settings.py b/myslice/settings.py
index bb9e74ad..a7bc662a 100644
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -29,6 +29,11 @@ ADMINS = (
MANAGERS = ADMINS
+# Mail configuration
+EMAIL_HOST = 'tibre.lip6.fr'
+EMAIL_PORT = 465
+DEFAULT_FROM_EMAIL = "support@myslice.info"
+
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
diff --git a/portal/urls.py b/portal/urls.py
index b3969ec0..cd789b9a 100644
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -21,12 +21,9 @@
# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
from django.conf.urls import patterns, include, url
-
-# DEPRECATED #from django.forms.formsets import formset_factory
-# DEPRECATED #from portal.forms import RegisterUserForm, RegisterUserStep2Form
-# DEPRECATED #from portal.views import RegisterUserWizardView
-from portal import views
-from portal.views import UserRegisterView, UserValidateView
+from portal import views
+from portal.views import UserRegisterView, UserValidateView
+from portal.util import TemplateView
# DEPRECATED #named_register_forms = (
# DEPRECATED # ("step1", RegisterUserForm),
@@ -39,6 +36,9 @@ from portal.views import UserRegisterView, UserValidateView
urlpatterns = patterns('',
# User registration
url(r'^user/register/?$', UserRegisterView.as_view(), name='user_register'),
+ url(r'^user/register/complete/$',
+ TemplateView.as_view(template_name='user_register_complete.html'),
+ name='user_register_complete'),
# User validation
url(r'^user/validate/?$', UserValidateView.as_view(), name='user_validate'),
# Slice request
diff --git a/portal/views.py b/portal/views.py
index 0a27fae3..09741d20 100644
--- a/portal/views.py
+++ b/portal/views.py
@@ -135,7 +135,7 @@ class UserRegisterView(RegistrationView):
user registration.
"""
- return ('registration_complete', (), {})
+ return ('user_register_complete', (), {})
class UserValidateView(ActivationView):
--
2.47.0