github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

[Update] 修改Mixin，允许org_id不填写

pull/1683/head
ibuler 2018-08-13 11:44:44 +08:00
parent d97e606503
commit c9d137bc20
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/orgs/mixins.py
View File

@ -55,7 +55,7 @@ class OrgManager(models.Manager):
class OrgModelMixin(models.Model): class OrgModelMixin(models.Model):
org_id = models.CharField(max_length=36, null=True, blank=True) org_id = models.CharField(max_length=36, null=True, blank=True, default=None)
objects = OrgManager() objects = OrgManager()
def save(self, *args, **kwargs): def save(self, *args, **kwargs):

1
apps/users/serializers.py
View File

@ -65,6 +65,7 @@ class UserGroupSerializer(BulkSerializerMixin, serializers.ModelSerializer):
model = UserGroup model = UserGroup
list_serializer_class = BulkListSerializer list_serializer_class = BulkListSerializer
fields = '__all__' fields = '__all__'
read_only_fields = ['id', 'created_by']
@staticmethod @staticmethod
def get_users(obj): def get_users(obj):