Commit 8328e668 authored by Sli's avatar Sli
Browse files

Fixed old database bug in dev env

parent c5fd9d00
Pipeline #179 failed with stage
in 2 minutes and 1 second
......@@ -240,7 +240,7 @@ class User(AbstractBaseUser):
else:
create = True
super(User, self).save(*args, **kwargs)
if create: # Create user on the old site: TODO remove me!
if create and settings.IS_OLD_MYSQL_PRESENT: # Create user on the old site: TODO remove me!
import MySQLdb
try:
db = MySQLdb.connect(**settings.OLD_MYSQL_INFOS)
......
......@@ -17,7 +17,13 @@ from django.utils.translation import ugettext_lazy as _
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
os.environ['HTTPS'] = "on"
DEV_ENV = True
if (DEV_ENV):
os.environ['HTTPS'] = "off"
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
else:
os.environ['HTTPS'] = "on"
# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/
......@@ -408,6 +414,7 @@ SITH_LAUNDERETTE_PRICES = {
'DRYING': 0.75,
}
IS_OLD_MYSQL_PRESENT = False
OLD_MYSQL_INFOS = {
'host': 'ae-db',
'user': "my_user",
......
......@@ -33,7 +33,7 @@ class Subscriber(User):
if not self.id:
create = True
super(Subscriber, self).save()
if create:
if create and settings.IS_OLD_MYSQL_PRESENT:
try: # Create user on the old site: TODO remove me!
db = MySQLdb.connect(**settings.OLD_MYSQL_INFOS)
c = db.cursor()
......@@ -82,6 +82,7 @@ class Subscription(models.Model):
form.save(use_https=True, email_template_name='core/new_user_email.jinja',
subject_template_name='core/new_user_email_subject.jinja', from_email="ae@utbm.fr")
self.member.make_home()
if settings.IS_OLD_MYSQL_PRESENT:
try: # Create subscription on the old site: TODO remove me!
LOCATION = {
"SEVENANS": 5,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment