diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index 394a0039c..268d4b3e9 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.po +++ b/apps/i18n/core/ja/LC_MESSAGES/django.po @@ -2917,7 +2917,7 @@ msgstr "否" #: audits/models.py:47 msgid "Job audit log" -msgstr "ジョブ監査ログ" +msgstr "業務監査" #: audits/models.py:56 audits/models.py:100 audits/models.py:175 #: terminal/models/session/session.py:39 terminal/models/session/sharing.py:113 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index d768f48fd..9c634275a 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/zh/LC_MESSAGES/django.po @@ -2859,7 +2859,7 @@ msgstr "否" #: audits/models.py:47 msgid "Job audit log" -msgstr "作业审计日志" +msgstr "作业审计" #: audits/models.py:56 audits/models.py:100 audits/models.py:175 #: terminal/models/session/session.py:39 terminal/models/session/sharing.py:113 diff --git a/apps/i18n/core/zh_Hant/LC_MESSAGES/django.po b/apps/i18n/core/zh_Hant/LC_MESSAGES/django.po index bf9de6395..188d2d482 100644 --- a/apps/i18n/core/zh_Hant/LC_MESSAGES/django.po +++ b/apps/i18n/core/zh_Hant/LC_MESSAGES/django.po @@ -2861,7 +2861,7 @@ msgstr "否" #: audits/models.py:47 msgid "Job audit log" -msgstr "作業審計日誌" +msgstr "作業審計" #: audits/models.py:56 audits/models.py:100 audits/models.py:175 #: terminal/models/session/session.py:39 terminal/models/session/sharing.py:113 diff --git a/apps/ops/serializers/variable.py b/apps/ops/serializers/variable.py index b78ec5510..11d554919 100644 --- a/apps/ops/serializers/variable.py +++ b/apps/ops/serializers/variable.py @@ -58,10 +58,10 @@ class VariableSerializer(CommonBulkModelSerializer): def to_representation(self, instance): data = super().to_representation(instance) if instance.type == FieldType.select: - data['extra_args'] = instance.extra_args.get('options', '') data['select_default_value'] = instance.default_value if instance.type == FieldType.text: data['text_default_value'] = instance.default_value + data['extra_args'] = instance.extra_args.get('options', '') return data @classmethod diff --git a/apps/rbac/tree.py b/apps/rbac/tree.py index 031d7bb55..80b6242db 100644 --- a/apps/rbac/tree.py +++ b/apps/rbac/tree.py @@ -64,6 +64,7 @@ extra_nodes_data = [ {'id': "tasks", "name": _("Task"), "pId": "view_setting"}, {'id': "license", "name": _("License"), "pId": "view_setting"}, {'id': "other", "name": _("Other"), "pId": "view_setting"}, + {'id': "job_audit", "name": _("Job audit log"), "pId": "view_audit"}, ] # 将 model 放到其它节点下,而不是本来的 app 中 @@ -109,7 +110,8 @@ special_pid_mapper = { "rbac.view_webterminal": "view_workbench", "rbac.view_filemanager": "view_workbench", "rbac.view_systemtools": "view_workbench", - 'tickets.view_ticket': 'tickets' + 'tickets.view_ticket': 'tickets', + "audits.joblog": "job_audit", } special_setting_pid_mapper = {