From 54387c05d87cb5277b3d48b4d1bfd2cc4870223b Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 30 Jul 2015 19:07:29 +0200 Subject: [PATCH] Begin to refactor / cleanup hostings Signed-off-by: Nico Schottelius --- dynamicweb/settings.py | 8 ++++++++ railshosting/views.py | 45 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 47 insertions(+), 6 deletions(-) diff --git a/dynamicweb/settings.py b/dynamicweb/settings.py index cf460c14..27e19529 100644 --- a/dynamicweb/settings.py +++ b/dynamicweb/settings.py @@ -15,9 +15,14 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/ + ADMINS = ( ('Nico Schottelius', 'nico.schottelius@ungleich.ch'), ) +# ('Sanghee Kim', 'sanghee.kim@ungleich.ch'), + + +MANAGERS = ADMINS SITE_ID = 1 @@ -27,6 +32,9 @@ LOGIN_URL = None LOGOUT_URL = None LOGIN_REDIRECT_URL = None +EMAIL_HOST="localhost" +EMAIL_PORT=25 + # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = 'xlhyv_l5-z6e8_@q6)n0up1a0$5-aad7d)om2t8g$bi6*@q44i' diff --git a/railshosting/views.py b/railshosting/views.py index 16264cfe..b8e68192 100644 --- a/railshosting/views.py +++ b/railshosting/views.py @@ -5,6 +5,8 @@ from django.forms import ModelForm from django.http import HttpResponseRedirect from django.core.urlresolvers import reverse +from django.core.mail import send_mail + from .models import RailsBetaUser class RailsBetaUserForm(ModelForm): @@ -23,34 +25,65 @@ def index(request): context['form'] = form if form.is_valid(): form.save() + email = form.cleaned_data['email'] + send_mail('(Rails-)Hosting request', "email: %s" % email, 'django@ungleich.ch', ['nico.schottelius@ungleich.ch'], fail_silently=False) + # mail_managers(subject, message, fail_silently=False, connection=None, html_message=None)[source] return HttpResponseRedirect(reverse("railshosting:beta")) else: context['error_message'] = "a problem" return render(request, 'railshosting/index.html', context) -def djangohosting(request): - context = {} +def hosting(request, context, page): + email = RailsBetaUser(received_date=datetime.datetime.now()) + + if request.method == 'POST': + context['form'] = RailsBetaUserForm(request.POST, instance=email) + if context['form'].is_valid(): + context['form'].save() + email = context['form'].cleaned_data['email'] + subject = "%shosting request" % context['hosting'] + message = "Request for beta by: %s" % email + + mail_managers(subject, message) + + # send_mail('(Rails-)Hosting request', "email: %s" % email, 'django@ungleich.ch', ['nico.schottelius@ungleich.ch'], fail_silently=False) + return HttpResponseRedirect(reverse("railshosting:beta")) + else: + context['form'] = RailsBetaUserForm() + context['error_message'] = "a problem" + + page = "railshosting/%s" % page + + return render(request, page, context) + +################################################################################ +# Hostings +# +def djangohosting(request): + page = 'django.html' + + context = {} context["hosting"]="django" context["hosting_long"]="Django" context["domain"]="django-hosting.ch" context["google_analytics"]="the right id" context["email"]="info@django-hosting.ch" - - return render(request, 'railshosting/django.html', context) + return hosting(request, page, context) def railshosting(request): - context = {} + page = 'rails.html' + context = {} context["hosting"]="rails" context["hosting_long"]="Ruby On Rails" context["domain"]="rails-hosting.ch" context["google_analytics"]="the right id" context["email"]="info@rails-hosting.ch" - return render(request, 'railshosting/rails.html', context) + return hosting(request, page, context) def beta(request): return render(request, 'railshosting/beta.html')