From f84d44fb9a421bdb3f9e5e3626a41fd861822ff2 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 16 Oct 2013 20:15:22 +0200 Subject: [PATCH] Minor changes on auth/users api/models --- greenmine/base/users/api.py | 2 +- greenmine/base/users/models.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/greenmine/base/users/api.py b/greenmine/base/users/api.py index fc915633..bb787505 100644 --- a/greenmine/base/users/api.py +++ b/greenmine/base/users/api.py @@ -150,7 +150,7 @@ class AuthViewSet(viewsets.ViewSet): serializer = UserSerializer(user) response_data = serializer.data - response_data["token"] = request.session.session_key + response_data["auth_token"] = request.session.session_key return Response(response_data) def destroy(self, request, pk=None): diff --git a/greenmine/base/users/models.py b/greenmine/base/users/models.py index 8f458b1b..8ffe1233 100644 --- a/greenmine/base/users/models.py +++ b/greenmine/base/users/models.py @@ -8,7 +8,7 @@ from greenmine.base.notifications.models import WatcherMixin class User(WatcherMixin, AbstractUser): - color = models.CharField(max_length=9, null=False, blank=False, default="#669933", + color = models.CharField(max_length=9, null=False, blank=True, default="#669933", verbose_name=_('color')) description = models.TextField(null=False, blank=True, verbose_name=_('description'))