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

fix: 工单流 全局组织不能更新 (#8735) 

Co-authored-by: feng626 <1304903146@qq.com>
pull/8740/head
fit2bot 2022-08-12 14:29:13 +08:00 committed by GitHub
parent 2e944c6898
commit 1ed388459b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/tickets/serializers/flow.py
View File

@ -3,6 +3,7 @@ from django.utils.translation import ugettext_lazy as _
from rest_framework import serializers from rest_framework import serializers
from orgs.models import Organization from orgs.models import Organization
from orgs.utils import get_current_org_id
from orgs.mixins.serializers import OrgResourceModelSerializerMixin from orgs.mixins.serializers import OrgResourceModelSerializerMixin
from tickets.models import TicketFlow, ApprovalRule from tickets.models import TicketFlow, ApprovalRule
from tickets.const import TicketApprovalStrategy from tickets.const import TicketApprovalStrategy
@ -96,7 +97,9 @@ class TicketFlowSerializer(OrgResourceModelSerializerMixin):
@atomic @atomic
def update(self, instance, validated_data): def update(self, instance, validated_data):
if instance.org_id == Organization.ROOT_ID: current_org_id = get_current_org_id()
root_org_id = Organization.ROOT_ID
if instance.org_id == root_org_id and current_org_id != root_org_id:
instance = self.create(validated_data) instance = self.create(validated_data)
else: else:
instance = self.create_or_update('update', validated_data, instance) instance = self.create_or_update('update', validated_data, instance)