perf: 优化禁用用户

This commit is contained in:
ibuler
2023-10-10 17:39:41 +08:00
committed by 老广
parent 0d101bc5ad
commit affa562384
5 changed files with 42 additions and 8 deletions

View File

@@ -10,7 +10,7 @@ from django.utils import timezone
from django.utils.translation import gettext, gettext_lazy as _
from common.db.encoder import ModelJSONFieldEncoder
from common.utils import lazyproperty
from common.utils import lazyproperty, i18n_trans
from ops.models import JobExecution
from orgs.mixins.models import OrgModelMixin, Organization
from orgs.utils import current_org
@@ -155,6 +155,10 @@ class ActivityLog(OrgModelMixin):
verbose_name = _("Activity log")
ordering = ('-datetime',)
def __str__(self):
detail = i18n_trans(self.detail)
return "{} {}".format(detail, self.resource_id)
def save(self, *args, **kwargs):
if current_org.is_root() and not self.org_id:
self.org_id = Organization.ROOT_ID