github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-03 18:16:37 +00:00
Code Issues Projects Releases Wiki Activity

fix: 添加profile myorgs (#7887)

Browse Source 
Co-authored-by: feng626 <1304903146@qq.com>
This commit is contained in:
fit2bot 2022-03-16 20:36:12 +08:00 committed by GitHub
parent 3b507dc795
commit 433d829c29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/users/models/user.py
View File

@ -790,6 +790,10 @@ class User(AuthMixin, TokenMixin, RoleMixin, MFAMixin, AbstractUser):
orgs = [Organization.root()] + orgs orgs = [Organization.root()] + orgs
return orgs return orgs
@property
def my_orgs(self):
return list(self.orgs.all().distinct())
class Meta: class Meta:
ordering = ['username'] ordering = ['username']
verbose_name = _("User") verbose_name = _("User")

3
apps/users/serializers/profile.py
View File

@ -122,12 +122,13 @@ class UserProfileSerializer(UserSerializer):
guide_url = serializers.SerializerMethodField() guide_url = serializers.SerializerMethodField()
receive_backends = serializers.ListField(child=serializers.CharField(), read_only=True) receive_backends = serializers.ListField(child=serializers.CharField(), read_only=True)
orgs = UserOrgSerializer(many=True, read_only=True, source='all_orgs') orgs = UserOrgSerializer(many=True, read_only=True, source='all_orgs')
myorgs = UserOrgSerializer(many=True, read_only=True, source='my_orgs')
perms = serializers.ListField(label=_("Perms"), read_only=True) perms = serializers.ListField(label=_("Perms"), read_only=True)
class Meta(UserSerializer.Meta): class Meta(UserSerializer.Meta):
read_only_fields = [ read_only_fields = [
'date_joined', 'last_login', 'created_by', 'source', 'date_joined', 'last_login', 'created_by', 'source',
'receive_backends', 'orgs', 'perms', 'receive_backends', 'orgs', 'myorgs', 'perms',
] ]
fields = UserSerializer.Meta.fields + [ fields = UserSerializer.Meta.fields + [
'public_key_comment', 'public_key_hash_md5', 'guide_url', 'public_key_comment', 'public_key_hash_md5', 'guide_url',