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

fix: modify job audit rbac

pull/14461/head
wangruidong 2024-11-14 15:42:51 +08:00 committed by Bryan
parent f03263eedf
commit 343c3607fa
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/i18n/core/ja/LC_MESSAGES/django.po
View File

@ -2917,7 +2917,7 @@ msgstr "否"
#: audits/models.py:47 #: audits/models.py:47
msgid "Job audit log" msgid "Job audit log"
msgstr "ジョブ監査ログ" msgstr "業務監査"
#: audits/models.py:56 audits/models.py:100 audits/models.py:175 #: audits/models.py:56 audits/models.py:100 audits/models.py:175
#: terminal/models/session/session.py:39 terminal/models/session/sharing.py:113 #: terminal/models/session/session.py:39 terminal/models/session/sharing.py:113

2
apps/i18n/core/zh/LC_MESSAGES/django.po
View File

@ -2859,7 +2859,7 @@ msgstr "否"
#: audits/models.py:47 #: audits/models.py:47
msgid "Job audit log" msgid "Job audit log"
msgstr "作业审计日志" msgstr "作业审计"
#: audits/models.py:56 audits/models.py:100 audits/models.py:175 #: audits/models.py:56 audits/models.py:100 audits/models.py:175
#: terminal/models/session/session.py:39 terminal/models/session/sharing.py:113 #: terminal/models/session/session.py:39 terminal/models/session/sharing.py:113

2
apps/i18n/core/zh_Hant/LC_MESSAGES/django.po
View File

@ -2861,7 +2861,7 @@ msgstr "否"
#: audits/models.py:47 #: audits/models.py:47
msgid "Job audit log" msgid "Job audit log"
msgstr "作業審計日誌" msgstr "作業審計"
#: audits/models.py:56 audits/models.py:100 audits/models.py:175 #: audits/models.py:56 audits/models.py:100 audits/models.py:175
#: terminal/models/session/session.py:39 terminal/models/session/sharing.py:113 #: terminal/models/session/session.py:39 terminal/models/session/sharing.py:113

2
apps/ops/serializers/variable.py
View File

@ -58,10 +58,10 @@ class VariableSerializer(CommonBulkModelSerializer):
def to_representation(self, instance): def to_representation(self, instance):
data = super().to_representation(instance) data = super().to_representation(instance)
if instance.type == FieldType.select: if instance.type == FieldType.select:
data['extra_args'] = instance.extra_args.get('options', '')
data['select_default_value'] = instance.default_value data['select_default_value'] = instance.default_value
if instance.type == FieldType.text: if instance.type == FieldType.text:
data['text_default_value'] = instance.default_value data['text_default_value'] = instance.default_value
data['extra_args'] = instance.extra_args.get('options', '')
return data return data
@classmethod @classmethod

4
apps/rbac/tree.py
View File

@ -64,6 +64,7 @@ extra_nodes_data = [
{'id': "tasks", "name": _("Task"), "pId": "view_setting"}, {'id': "tasks", "name": _("Task"), "pId": "view_setting"},
{'id': "license", "name": _("License"), "pId": "view_setting"}, {'id': "license", "name": _("License"), "pId": "view_setting"},
{'id': "other", "name": _("Other"), "pId": "view_setting"}, {'id': "other", "name": _("Other"), "pId": "view_setting"},
{'id': "job_audit", "name": _("Job audit log"), "pId": "view_audit"},
] ]
# 将 model 放到其它节点下，而不是本来的 app 中 # 将 model 放到其它节点下，而不是本来的 app 中
@ -109,7 +110,8 @@ special_pid_mapper = {
"rbac.view_webterminal": "view_workbench", "rbac.view_webterminal": "view_workbench",
"rbac.view_filemanager": "view_workbench", "rbac.view_filemanager": "view_workbench",
"rbac.view_systemtools": "view_workbench", "rbac.view_systemtools": "view_workbench",
'tickets.view_ticket': 'tickets' 'tickets.view_ticket': 'tickets',
"audits.joblog": "job_audit",
} }
special_setting_pid_mapper = { special_setting_pid_mapper = {