diff -r 41a78460bdac -r ea633c8f9bfa server/src/authentication/views.py --- a/server/src/authentication/views.py Fri Jun 05 16:10:12 2015 +0200 +++ b/server/src/authentication/views.py Tue Jun 09 19:05:05 2015 +0200 @@ -8,10 +8,11 @@ from rest_framework.response import Response from rest_framework.views import APIView +from config import URL_JAMESPOT from ammico.views import populateVisit -from config import URL_JAMESPOT +#from ammico.views import populateVisit class UserSerializer(serializers.ModelSerializer): class Meta: model = get_user_model() @@ -54,7 +55,7 @@ def post(self, request): user = get_user_model().objects.get(email = request.data['email'], password = request.data['password']) - if (user.idUser): - populateVisit(user) + if (user.idUser and 'idExpo' in request.GET): + populateVisit(user, request.GET['idExpo']); token, _ = Token.objects.get_or_create(user=user) return Response({'token': token.key}) \ No newline at end of file