github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-24 21:08:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10213 from jumpserver/dev

Browse Source 
v3.2.0 rc2
This commit is contained in:
Jiangjie.Bai
2023-04-14 18:33:00 +08:00
committed by GitHub
parent 8a3a9c87a8 690e01cb78
commit 9109a5e6a2
23 changed files with 413 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/accounts/serializers/account/account.py
View File

@@ -97,7 +97,7 @@ class AccountCreateUpdateSerializerMixin(serializers.Serializer):
@staticmethod
def push_account_if_need(instance, push_now, params, stat):
if not push_now or stat != 'created':
if not push_now or stat not in ['created', 'updated']:
return
push_accounts_to_assets_task.delay([str(instance.id)], params)
@@ -407,3 +407,7 @@ class AccountTaskSerializer(serializers.Serializer):
queryset=Account.objects, required=False, allow_empty=True, many=True
)
task = serializers.CharField(read_only=True)
params = serializers.JSONField(
decoder=None, encoder=None, required=False,
style={'base_template': 'textarea.html'}
)