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

[Update] 工单提交

pull/3454/head
ibuler 2019-11-18 12:14:16 +08:00
parent 2f4096bf3d
commit 030551d987
3 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
apps/locale/zh/LC_MESSAGES/django.mo
View File

Binary file not shown.

33
apps/locale/zh/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Jumpserver 0.3.3\n" "Project-Id-Version: Jumpserver 0.3.3\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-11-18 11:41+0800\n" "POT-Creation-Date: 2019-11-18 12:04+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: ibuler <ibuler@qq.com>\n" "Last-Translator: ibuler <ibuler@qq.com>\n"
"Language-Team: Jumpserver team<ibuler@qq.com>\n" "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@ -527,7 +527,7 @@ msgstr "创建远程应用"
#: settings/templates/settings/terminal_setting.html:107 #: settings/templates/settings/terminal_setting.html:107
#: terminal/templates/terminal/session_list.html:36 #: terminal/templates/terminal/session_list.html:36
#: terminal/templates/terminal/terminal_list.html:36 #: terminal/templates/terminal/terminal_list.html:36
#: tickets/templates/tickets/ticket_list.html:94 #: tickets/templates/tickets/ticket_list.html:106
#: users/templates/users/_granted_assets.html:34 #: users/templates/users/_granted_assets.html:34
#: users/templates/users/user_group_list.html:38 #: users/templates/users/user_group_list.html:38
#: users/templates/users/user_list.html:41 #: users/templates/users/user_list.html:41
@ -1045,7 +1045,7 @@ msgstr "过滤器"
#: settings/templates/settings/terminal_setting.html:84 #: settings/templates/settings/terminal_setting.html:84
#: settings/templates/settings/terminal_setting.html:106 #: settings/templates/settings/terminal_setting.html:106
#: tickets/models/ticket.py:42 tickets/templates/tickets/ticket_detail.html:33 #: tickets/models/ticket.py:42 tickets/templates/tickets/ticket_detail.html:33
#: tickets/templates/tickets/ticket_list.html:23 #: tickets/templates/tickets/ticket_list.html:35
msgid "Type" msgid "Type"
msgstr "类型" msgstr "类型"
@ -1128,8 +1128,8 @@ msgstr "默认资产组"
#: terminal/templates/terminal/session_list.html:27 #: terminal/templates/terminal/session_list.html:27
#: terminal/templates/terminal/session_list.html:71 tickets/models/ticket.py:32 #: terminal/templates/terminal/session_list.html:71 tickets/models/ticket.py:32
#: tickets/models/ticket.py:104 tickets/templates/tickets/ticket_detail.html:32 #: tickets/models/ticket.py:104 tickets/templates/tickets/ticket_detail.html:32
#: tickets/templates/tickets/ticket_list.html:22 #: tickets/templates/tickets/ticket_list.html:34
#: tickets/templates/tickets/ticket_list.html:89 users/forms.py:339 #: tickets/templates/tickets/ticket_list.html:101 users/forms.py:339
#: users/models/user.py:149 users/models/user.py:165 users/models/user.py:537 #: users/models/user.py:149 users/models/user.py:165 users/models/user.py:537
#: users/serializers/group.py:21 #: users/serializers/group.py:21
#: users/templates/users/user_group_detail.html:78 #: users/templates/users/user_group_detail.html:78
@ -1515,7 +1515,7 @@ msgstr "关闭"
#: ops/templates/ops/task_adhoc.html:63 #: ops/templates/ops/task_adhoc.html:63
#: terminal/templates/terminal/command_list.html:33 #: terminal/templates/terminal/command_list.html:33
#: terminal/templates/terminal/session_detail.html:50 #: terminal/templates/terminal/session_detail.html:50
#: tickets/templates/tickets/ticket_list.html:25 #: tickets/templates/tickets/ticket_list.html:37
msgid "Datetime" msgid "Datetime"
msgstr "日期" msgstr "日期"
@ -2305,8 +2305,8 @@ msgstr "原因"
#: audits/models.py:88 audits/templates/audits/login_log_list.html:64 #: audits/models.py:88 audits/templates/audits/login_log_list.html:64
#: tickets/templates/tickets/ticket_detail.html:34 #: tickets/templates/tickets/ticket_detail.html:34
#: tickets/templates/tickets/ticket_list.html:24 #: tickets/templates/tickets/ticket_list.html:36
#: tickets/templates/tickets/ticket_list.html:90 #: tickets/templates/tickets/ticket_list.html:102
#: xpack/plugins/cloud/models.py:275 xpack/plugins/cloud/models.py:310 #: xpack/plugins/cloud/models.py:275 xpack/plugins/cloud/models.py:310
#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:70 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:70
#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:65 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:65
@ -3226,6 +3226,7 @@ msgid "Actions"
msgstr "动作" msgstr "动作"
#: perms/models/asset_permission.py:87 templates/_nav.html:72 #: perms/models/asset_permission.py:87 templates/_nav.html:72
#: tickets/templates/tickets/ticket_list.html:22
msgid "Asset permission" msgid "Asset permission"
msgstr "资产授权" msgstr "资产授权"
@ -4563,7 +4564,7 @@ msgstr "接受"
#: terminal/templates/terminal/terminal_list.html:80 #: terminal/templates/terminal/terminal_list.html:80
#: tickets/models/ticket.py:30 tickets/templates/tickets/ticket_detail.html:101 #: tickets/models/ticket.py:30 tickets/templates/tickets/ticket_detail.html:101
#: tickets/templates/tickets/ticket_list.html:96 #: tickets/templates/tickets/ticket_list.html:108
msgid "Reject" msgid "Reject"
msgstr "拒绝" msgstr "拒绝"
@ -4601,11 +4602,11 @@ msgid ""
msgstr "你可以使用ssh客户端工具连接终端" msgstr "你可以使用ssh客户端工具连接终端"
#: tickets/models/ticket.py:17 tickets/models/ticket.py:69 #: tickets/models/ticket.py:17 tickets/models/ticket.py:69
#: tickets/templates/tickets/ticket_list.html:91 #: tickets/templates/tickets/ticket_list.html:103
msgid "Open" msgid "Open"
msgstr "开启" msgstr "开启"
#: tickets/models/ticket.py:18 tickets/templates/tickets/ticket_list.html:92 #: tickets/models/ticket.py:18 tickets/templates/tickets/ticket_list.html:104
msgid "Closed" msgid "Closed"
msgstr "关闭" msgstr "关闭"
@ -4618,7 +4619,7 @@ msgid "Login confirm"
msgstr "登录复核" msgstr "登录复核"
#: tickets/models/ticket.py:29 tickets/templates/tickets/ticket_detail.html:100 #: tickets/models/ticket.py:29 tickets/templates/tickets/ticket_detail.html:100
#: tickets/templates/tickets/ticket_list.html:95 #: tickets/templates/tickets/ticket_list.html:107
msgid "Approve" msgid "Approve"
msgstr "同意" msgstr "同意"
@ -4626,8 +4627,8 @@ msgstr "同意"
msgid "User display name" msgid "User display name"
msgstr "用户显示名称" msgstr "用户显示名称"
#: tickets/models/ticket.py:35 tickets/templates/tickets/ticket_list.html:21 #: tickets/models/ticket.py:35 tickets/templates/tickets/ticket_list.html:33
#: tickets/templates/tickets/ticket_list.html:88 #: tickets/templates/tickets/ticket_list.html:100
msgid "Title" msgid "Title"
msgstr "标题" msgstr "标题"
@ -4676,6 +4677,10 @@ msgstr "我的工单"
msgid "Assigned me" msgid "Assigned me"
msgstr "待处理" msgstr "待处理"
#: tickets/templates/tickets/ticket_list.html:19
msgid "Create ticket"
msgstr "提交工单"
#: tickets/utils.py:18 #: tickets/utils.py:18
msgid "New ticket" msgid "New ticket"
msgstr "新工单" msgstr "新工单"

12
apps/tickets/templates/tickets/ticket_list.html
View File

@ -12,6 +12,18 @@
<div class="tab-content"> <div class="tab-content">
<div id="my-tickets" class="tab-pane active"> <div id="my-tickets" class="tab-pane active">
<div class="panel-body"> <div class="panel-body">
{% if not assign %}
<div class="uc pull-left m-r-5">
<div class="btn-group">
<button data-toggle="dropdown" class="btn btn-primary btn-sm dropdown-toggle" aria-expanded="false">
{% trans 'Create ticket' %} <span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a href="#">{% trans 'Asset permission' %}</a></li>
</ul>
</div>
</div>
{% endif %}
<table class="table table-striped table-bordered table-hover" id="ticket-list-table" > <table class="table table-striped table-bordered table-hover" id="ticket-list-table" >
<thead> <thead>
<tr> <tr>