Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
31f09844
J
jumpserver
项目概览
gjl2004yn
/
jumpserver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jumpserver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
31f09844
编写于
1月 18, 2021
作者:
B
Bai
提交者:
Jiangjie.Bai
1月 18, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
perf: 修改 OPTION 获取 choices 字段选项; 修改display字段翻译 (显示名称)
上级
e6151137
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
33 addition
and
24 deletion
+33
-24
apps/common/drf/metadata.py
apps/common/drf/metadata.py
+2
-3
apps/locale/zh/LC_MESSAGES/django.mo
apps/locale/zh/LC_MESSAGES/django.mo
+0
-0
apps/locale/zh/LC_MESSAGES/django.po
apps/locale/zh/LC_MESSAGES/django.po
+24
-18
apps/tickets/serializers/ticket/ticket.py
apps/tickets/serializers/ticket/ticket.py
+7
-3
未找到文件。
apps/common/drf/metadata.py
浏览文件 @
31f09844
...
...
@@ -73,9 +73,8 @@ class SimpleMetadataWithFilters(SimpleMetadata):
elif
getattr
(
field
,
'fields'
,
None
):
field_info
[
'children'
]
=
self
.
get_serializer_info
(
field
)
if
(
not
field_info
.
get
(
'read_only'
)
and
not
isinstance
(
field
,
(
serializers
.
RelatedField
,
serializers
.
ManyRelatedField
))
and
hasattr
(
field
,
'choices'
)):
if
not
isinstance
(
field
,
(
serializers
.
RelatedField
,
serializers
.
ManyRelatedField
))
\
and
hasattr
(
field
,
'choices'
):
field_info
[
'choices'
]
=
[
{
'value'
:
choice_value
,
...
...
apps/locale/zh/LC_MESSAGES/django.mo
浏览文件 @
31f09844
无法预览此类型文件
apps/locale/zh/LC_MESSAGES/django.po
浏览文件 @
31f09844
...
...
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: JumpServer 0.3.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-01-1
7 16:1
2+0800\n"
"POT-Creation-Date: 2021-01-1
8 14:5
2+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: ibuler <ibuler@qq.com>\n"
"Language-Team: JumpServer team<ibuler@qq.com>\n"
...
...
@@ -74,7 +74,6 @@ msgstr "种类"
#: terminal/models/storage.py:18 terminal/models/storage.py:58
#: tickets/models/ticket.py:38
#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:25
#: tickets/serializers/ticket/ticket.py:19
#: users/templates/users/user_granted_database_app.html:35
msgid "Type"
msgstr "类型"
...
...
@@ -508,8 +507,7 @@ msgstr "每行一个命令"
#: assets/models/cmd_filter.py:56 audits/models.py:57
#: authentication/templates/authentication/_access_key_modal.html:34
#: tickets/models/ticket.py:43 tickets/serializers/ticket/ticket.py:20
#: users/templates/users/_granted_assets.html:29
#: tickets/models/ticket.py:43 users/templates/users/_granted_assets.html:29
#: users/templates/users/user_asset_permission.html:44
#: users/templates/users/user_asset_permission.html:79
#: users/templates/users/user_database_app_permission.html:42
...
...
@@ -1093,8 +1091,7 @@ msgid "Reason"
msgstr "原因"
#: audits/models.py:106 tickets/models/ticket.py:47
#: tickets/serializers/ticket/ticket.py:21 xpack/plugins/cloud/models.py:224
#: xpack/plugins/cloud/models.py:282
#: xpack/plugins/cloud/models.py:224 xpack/plugins/cloud/models.py:282
msgid "Status"
msgstr "状态"
...
...
@@ -1804,7 +1801,7 @@ msgstr "当前组织不能被删除"
#: orgs/mixins/models.py:56 orgs/mixins/serializers.py:25 orgs/models.py:41
#: orgs/models.py:422 orgs/serializers.py:100
#: tickets/serializers/ticket/ticket.py:7
4
#: tickets/serializers/ticket/ticket.py:7
8
msgid "Organization"
msgstr "组织"
...
...
@@ -2864,7 +2861,7 @@ msgstr "申请人"
#: tickets/models/ticket.py:55
msgid "Applicant display"
msgstr "申请人"
msgstr "申请人
(显示名称)
"
#: tickets/models/ticket.py:60
msgid "Processor"
...
...
@@ -2872,7 +2869,7 @@ msgstr "处理人"
#: tickets/models/ticket.py:63
msgid "Processor display"
msgstr "处理人"
msgstr "处理人
(显示名称)
"
#: tickets/models/ticket.py:67
msgid "Assignees"
...
...
@@ -2880,15 +2877,16 @@ msgstr "受理人"
#: tickets/models/ticket.py:70
msgid "Assignees display"
msgstr "受理人"
msgstr "受理人
(显示名称)
"
#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:22
msgid "Category display"
msgstr "种类"
msgstr "种类
(显示名称)
"
#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:29
#: tickets/serializers/ticket/ticket.py:19
msgid "Type display"
msgstr "类型"
msgstr "类型
(显示名称)
"
#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:33
msgid "Application group"
...
...
@@ -2905,7 +2903,7 @@ msgstr "批准的应用"
#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:56
msgid "Approve applications display"
msgstr "批准的应用"
msgstr "批准的应用
(显示名称)
"
#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:60
#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:57
...
...
@@ -2914,7 +2912,7 @@ msgstr "批准的系统用户"
#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:65
msgid "Approve system user display"
msgstr "批准的系统用户"
msgstr "批准的系统用户
(显示名称)
"
#: tickets/serializers/ticket/meta/ticket_type/apply_application.py:89
msgid "No `Application` are found under Organization `{}`"
...
...
@@ -2938,7 +2936,7 @@ msgstr "主机名组"
#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:61
#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:69
msgid "Approve assets display"
msgstr "批准的资产"
msgstr "批准的资产
(显示名称)
"
#: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:48
msgid "Approve assets"
...
...
@@ -2952,17 +2950,25 @@ msgstr "在组织 `{}` 下没有发现 `资产`"
msgid "Login datetime"
msgstr "登录日期"
#: tickets/serializers/ticket/ticket.py:92
#: tickets/serializers/ticket/ticket.py:21
msgid "Action display"
msgstr "动作 (显示名称)"
#: tickets/serializers/ticket/ticket.py:24
msgid "Status display"
msgstr "状态(显示名称)"
#: tickets/serializers/ticket/ticket.py:96
msgid ""
"The `type` in the submission data (`{}`) is different from the type in the "
"request url (`{}`)"
msgstr "提交数据中的类型 (`{}`) 与请求URL地址中的类型 (`{}`) 不一致"
#: tickets/serializers/ticket/ticket.py:10
2
#: tickets/serializers/ticket/ticket.py:10
6
msgid "The organization `{}` does not exist"
msgstr "组织 `{}` 不存在"
#: tickets/serializers/ticket/ticket.py:11
3
#: tickets/serializers/ticket/ticket.py:11
7
msgid "None of the assignees belong to Organization `{}` admins"
msgstr "所有受理人都不属于组织 `{}` 下的管理员"
...
...
apps/tickets/serializers/ticket/ticket.py
浏览文件 @
31f09844
...
...
@@ -16,9 +16,13 @@ __all__ = [
class
TicketSerializer
(
OrgResourceModelSerializerMixin
):
type_display
=
serializers
.
ReadOnlyField
(
source
=
'get_type_display'
,
label
=
_
(
'Type'
))
action_display
=
serializers
.
ReadOnlyField
(
source
=
'get_action_display'
,
label
=
_
(
'Action'
))
status_display
=
serializers
.
ReadOnlyField
(
source
=
'get_status_display'
,
label
=
_
(
'Status'
))
type_display
=
serializers
.
ReadOnlyField
(
source
=
'get_type_display'
,
label
=
_
(
'Type display'
))
action_display
=
serializers
.
ReadOnlyField
(
source
=
'get_action_display'
,
label
=
_
(
'Action display'
)
)
status_display
=
serializers
.
ReadOnlyField
(
source
=
'get_status_display'
,
label
=
_
(
'Status display'
)
)
meta
=
MethodSerializer
()
class
Meta
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录