taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor changes on auth/users api/models

remotes/origin/enhancement/email-actions
Andrey Antukh 2013-10-16 20:15:22 +02:00
parent 103771e143
commit f84d44fb9a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
greenmine/base/users/api.py
View File

@ -150,7 +150,7 @@ class AuthViewSet(viewsets.ViewSet):
serializer = UserSerializer(user) serializer = UserSerializer(user)
response_data = serializer.data response_data = serializer.data
response_data["token"] = request.session.session_key response_data["auth_token"] = request.session.session_key
return Response(response_data) return Response(response_data)
def destroy(self, request, pk=None): def destroy(self, request, pk=None):

2
greenmine/base/users/models.py
View File

@ -8,7 +8,7 @@ from greenmine.base.notifications.models import WatcherMixin
class User(WatcherMixin, AbstractUser): 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')) verbose_name=_('color'))
description = models.TextField(null=False, blank=True, description = models.TextField(null=False, blank=True,
verbose_name=_('description')) verbose_name=_('description'))