mirror of https://github.com/jumpserver/jumpserver
parent
a28239f313
commit
f47d0b1a40
|
@ -1,12 +1,12 @@
|
||||||
import json
|
import json
|
||||||
import uuid
|
|
||||||
import logging
|
import logging
|
||||||
|
import uuid
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
|
||||||
from django.utils import timezone as dj_timezone
|
|
||||||
from django.db import models
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
from django.db import models
|
||||||
|
from django.utils import timezone as dj_timezone
|
||||||
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
lazy_type = type(_('ugettext_lazy'))
|
lazy_type = type(_('ugettext_lazy'))
|
||||||
|
|
||||||
|
@ -28,5 +28,5 @@ class ModelJSONFieldEncoder(json.JSONEncoder):
|
||||||
try:
|
try:
|
||||||
return super().default(obj)
|
return super().default(obj)
|
||||||
except TypeError:
|
except TypeError:
|
||||||
logging.error('Type error: ', type(obj))
|
logging.error(f'Type error: {type(obj)}')
|
||||||
return str(obj)
|
return str(obj)
|
||||||
|
|
|
@ -3,16 +3,16 @@ from urllib.parse import urljoin
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core.cache import cache
|
from django.core.cache import cache
|
||||||
from django.shortcuts import reverse
|
|
||||||
from django.forms import model_to_dict
|
from django.forms import model_to_dict
|
||||||
|
from django.shortcuts import reverse
|
||||||
from django.template.loader import render_to_string
|
from django.template.loader import render_to_string
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from notifications.notifications import UserMessage
|
|
||||||
from common.utils import get_logger, random_string
|
|
||||||
from common.db.encoder import ModelJSONFieldEncoder
|
from common.db.encoder import ModelJSONFieldEncoder
|
||||||
from .models import Ticket
|
from common.utils import get_logger, random_string
|
||||||
|
from notifications.notifications import UserMessage
|
||||||
from . import const
|
from . import const
|
||||||
|
from .models import Ticket
|
||||||
|
|
||||||
logger = get_logger(__file__)
|
logger = get_logger(__file__)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue