diff --git a/apps/orgs/utils.py b/apps/orgs/utils.py index 21f96f20c..1b9025b18 100644 --- a/apps/orgs/utils.py +++ b/apps/orgs/utils.py @@ -5,8 +5,8 @@ from contextlib import contextmanager from functools import wraps from inspect import signature -from werkzeug.local import LocalProxy from django.conf import settings +from werkzeug.local import LocalProxy from common.local import thread_local from .models import Organization @@ -57,6 +57,8 @@ def get_org_from_request(request): def set_current_org(org): if isinstance(org, (str, uuid.UUID)): org = Organization.get_instance(org) + if not org: + return setattr(thread_local, 'current_org_id', org.id) diff --git a/apps/tickets/models/ticket/general.py b/apps/tickets/models/ticket/general.py index d0e8497c8..1696c94eb 100644 --- a/apps/tickets/models/ticket/general.py +++ b/apps/tickets/models/ticket/general.py @@ -424,7 +424,8 @@ class Ticket(StatusMixin, JMSBaseModel): new_values.append(str(new_value)) value = ', '.join(new_values) elif name == 'org_id': - value = Organization.get_instance(value).name + org = Organization.get_instance(value) + value = org.name if org else '' elif isinstance(value, list): value = ', '.join(value) return value