github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stage-release' of github.com:makeplane/plane into fix/my_project_member_viewset

Browse Source
This commit is contained in:
pablohashescobar 2022-12-20 15:31:59 +05:30
commit b61d63ecbb
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apiserver/plane/api/views/people.py
View File

@ -52,7 +52,6 @@ class PeopleEndpoint(BaseAPIView):
class UserEndpoint(BaseViewSet): class UserEndpoint(BaseViewSet):
serializer_class = UserSerializer serializer_class = UserSerializer
model = User model = User
serializers = {}
def get_object(self): def get_object(self):
return self.request.user return self.request.user

18
apiserver/plane/db/migrations/0012_user_my_issues_prop.py Normal file
View File

@ -0,0 +1,18 @@
# Generated by Django 3.2.14 on 2022-12-20 09:48
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('db', '0011_auto_20221216_0259'),
]
operations = [
migrations.AddField(
model_name='user',
name='my_issues_prop',
field=models.JSONField(null=True),
),
]

1
apiserver/plane/db/models/user.py
View File

@ -66,6 +66,7 @@ class User(AbstractBaseUser, PermissionsMixin):
last_login_uagent = models.TextField(blank=True) last_login_uagent = models.TextField(blank=True)
token_updated_at = models.DateTimeField(null=True) token_updated_at = models.DateTimeField(null=True)
last_workspace_id = models.UUIDField(null=True) last_workspace_id = models.UUIDField(null=True)
my_issues_prop = models.JSONField(null=True)
USERNAME_FIELD = "email" USERNAME_FIELD = "email"