- Changer de compte + {% if user.is_authenticated %}Changer de compte{% else %}Se connecter{% endif %}
Pseudonyme : - +
Email : - +
Mot de passe : - +
Confirmer le mot de passe : - +
@@ -45,14 +48,15 @@
- E-mail : - + Pseudonyme : +
- Mot de passe : - + Mot de passe : +
diff -r c4ee4cab84d3 -r 1a78608617aa src/hashcut/templates/partial/iri_mashup_popin_user.html --- a/src/hashcut/templates/partial/iri_mashup_popin_user.html Fri Nov 30 17:05:15 2012 +0100 +++ b/src/hashcut/templates/partial/iri_mashup_popin_user.html Sat Dec 01 23:48:11 2012 +0100 @@ -3,11 +3,13 @@
diff -r c4ee4cab84d3 -r 1a78608617aa src/hashcut/urls.py --- a/src/hashcut/urls.py Fri Nov 30 17:05:15 2012 +0100 +++ b/src/hashcut/urls.py Sat Dec 01 23:48:11 2012 +0100 @@ -1,5 +1,6 @@ from django.conf.urls.defaults import patterns, url -from hashcut.views import MashupHome, MashupEdit, MashupHashcut, MashupContent, MashupProfile, MashupAllMashups +from hashcut.views import MashupHome, MashupEdit, MashupHashcut, MashupContent, MashupProfile, MashupAllMashups,\ + MashupCreateUser, MashupIdenticateUser urlpatterns = patterns('', url(r'^(?P.*)/edit/$', MashupEdit.as_view(), name="mashup_edit"), @@ -8,6 +9,8 @@ url(r'^(?P.*)/media/(?P.*)/$', MashupContent.as_view(), name="mashup_content"), url(r'^(?P.*)/profile/(?P.*)/$', MashupProfile.as_view(), name="mashup_profile"), url(r'^(?P.*)/all/$', MashupAllMashups.as_view(), name="mashup_all"), + url(r'^(?P.*)/createuser/$', MashupCreateUser.as_view(), name="mashup_create_user"), + url(r'^(?P.*)/iduser/$', MashupIdenticateUser.as_view(), name="mashup_identicate_user"), url(r'^(?P.*)/$', MashupHome.as_view(), name="mashup_home"), url(r'^$', MashupHome.as_view()), ) diff -r c4ee4cab84d3 -r 1a78608617aa src/hashcut/views.py --- a/src/hashcut/views.py Fri Nov 30 17:05:15 2012 +0100 +++ b/src/hashcut/views.py Sat Dec 01 23:48:11 2012 +0100 @@ -1,13 +1,15 @@ from django.conf import settings +from django.contrib.auth import authenticate, login from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist from django.core.paginator import Paginator, InvalidPage, EmptyPage -from django.http import HttpResponseNotFound +from django.http import HttpResponseNotFound, HttpResponse from django.views.generic.base import View, TemplateResponseMixin from ldt.api.ldt.resources import ProjectResource from ldt.ldt_utils.models import Project, Content import logging from hashcut.models import Mashup, Branding from django.contrib.auth.models import User +from django.shortcuts import redirect class MashupContextView(View): @@ -16,10 +18,8 @@ def get_context_dict(self, request): context = {} context["branding"] = self.branding - context["creator"] = "" - context["nb_mashup_creator"] = "" - if request and request.user: - context["creator"] = request.user.username + context["nb_mashup_creator"] = "0" + if request and request.user and isinstance(request.user, User): if not self.branding or self.branding=="": self.branding = "iri" brd = Branding.objects.get(name=self.branding) @@ -281,5 +281,57 @@ context = self.get_context_dict(request) context.update({"results":results}) return self.render_to_response(context) + + + +class MashupCreateUser(MashupHome): + + def get(self, request, branding="iri", **kwargs): + return redirect('mashup_home', branding=branding) + + def post(self, request, branding="iri", **kwargs): + if request.method == "POST": + u_username = request.POST["signup-pseudo"] + u_email = request.POST["signup-email"] + u_pwd1 = request.POST["signup-password"] + u_pwd2 = request.POST["signup-confirm-password"] + if u_pwd1 == "" or u_pwd1 != u_pwd2: + return HttpResponse("Password don't match.") + u = None + try: + u = User.objects.get(username=u_username) + except User.DoesNotExist: + pass + if u: + return HttpResponse("Username already exists.") + u = User.objects.create_user(u_username, u_email, u_pwd1) + u.save() + u_auth = authenticate(username=u.username, password=u_pwd1) + if u_auth: + login(request, u_auth) + else: + return HttpResponse("Problem in authentication. User and password don't match.") + return redirect('mashup_home', branding=branding) + + + +class MashupIdenticateUser(MashupHome): + + def get(self, request, branding="iri", **kwargs): + return redirect('mashup_home', branding=branding) + + def post(self, request, branding="iri", **kwargs): + if request.method == "POST": + u_username = request.POST["signup-pseudo"] + u_pwd = request.POST["signup-password"] + if u_username == "" or u_pwd == "": + return HttpResponse("User and password don't match.") + u_auth = authenticate(username=u_username, password=u_pwd) + if u_auth: + login(request, u_auth) + else: + return HttpResponse("Problem in authentication. User and password don't match.") + return redirect('mashup_home', branding=branding) + \ No newline at end of file