diff options
| -rw-r--r-- | allotter/forms.py | 6 | ||||
| -rw-r--r-- | allotter/urls.py | 3 | ||||
| -rw-r--r-- | allotter/views.py | 18 |
3 files changed, 7 insertions, 20 deletions
diff --git a/allotter/forms.py b/allotter/forms.py index 5941932..fff29b2 100644 --- a/allotter/forms.py +++ b/allotter/forms.py @@ -60,12 +60,6 @@ class RegistrationForm(forms.Form): except User.DoesNotExist: return u_name - - def clean_password(self): - pwd = self.cleaned_data['password'] - if pwd.strip(PWD_CHARS): - raise forms.ValidationError("Only letters, digits and punctuation \ - are allowed in password") def clean_confirm_password(self): c_pwd = self.cleaned_data['confirm_password'] diff --git a/allotter/urls.py b/allotter/urls.py index 43579de..79b1d22 100644 --- a/allotter/urls.py +++ b/allotter/urls.py @@ -1,9 +1,8 @@ from django.conf.urls.defaults import patterns, url urlpatterns = patterns('allotter.views', - url(r'^$', 'index'), + url(r'^$', 'hello'), url(r'^login/$', 'user_login'), url(r'^register/$', 'user_register'), - url(r'^hello/$', 'hello'), url(r'^apply/$', 'apply'), ) diff --git a/allotter/views.py b/allotter/views.py index 5790ddd..01425df 100644 --- a/allotter/views.py +++ b/allotter/views.py @@ -10,14 +10,6 @@ from allotter.forms import RegistrationForm, UserLoginForm from settings import URL_ROOT -def index(request): - """The start page. - """ - user = request.user - if user.is_authenticated(): - return redirect("/allotter/hello/") - - return redirect("/allotter/login/") def user_register(request): """ Register a new user. @@ -25,7 +17,7 @@ def user_register(request): user = request.user if user.is_authenticated(): - return redirect("/allotter/hello/") + return redirect("/allotter/") if request.method == "POST": form = RegistrationForm(request.POST) @@ -33,7 +25,9 @@ def user_register(request): data = form.cleaned_data u_name, pwd = form.save_data() - return redirect("/allotter/hello/") + new_user = authenticate(username = u_name, password = pwd) + login(request, new_user) + return redirect("/allotter/") else: return render_to_response('allotter/register.html', @@ -50,14 +44,14 @@ def user_login(request): user = request.user if user.is_authenticated(): - return redirect("/allotter/hello/") + return redirect("/allotter/") if request.method == "POST": form = UserLoginForm(request.POST) if form.is_valid(): user = form.cleaned_data login(request, user) - return redirect("/allotter/hello/") + return redirect("/allotter/") else: context = {"form": form} return render_to_response('allotter/login.html', context, |