From fe235823b45b00e972704e3c68e5efa95fb2563d Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 30 Oct 2019 19:30:49 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/authentication/models.py | 2 +- apps/locale/zh/LC_MESSAGES/django.mo | Bin 81958 -> 82485 bytes apps/locale/zh/LC_MESSAGES/django.po | 61 ++++++++++--- apps/orders/api.py | 1 + .../orders/login_confirm_order_list.html | 16 +++- apps/static/css/jumpserver.css | 80 +++++++++++++++++ apps/static/js/jumpserver.js | 7 +- apps/templates/_filter_dropdown.html | 81 ++++++++++++++++++ 8 files changed, 234 insertions(+), 14 deletions(-) create mode 100644 apps/templates/_filter_dropdown.html diff --git a/apps/authentication/models.py b/apps/authentication/models.py index bc92eb8b5..f50305651 100644 --- a/apps/authentication/models.py +++ b/apps/authentication/models.py @@ -50,7 +50,7 @@ class LoginConfirmSetting(CommonModelMixin): def create_confirm_order(self, request=None): from orders.models import LoginConfirmOrder - title = _('User login request: {}'.format(self.user)) + title = _('User login confirm: {}'.format(self.user)) if request: remote_addr = get_request_ip(request) city = get_ip_city(remote_addr) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 6f724f936f9dee30ca50475f535c01280cfb31f7..fe18ec6df3287cda3353a310f4bd41666bc8eca2 100644 GIT binary patch delta 24361 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 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 0f18de91d..3d36fc15e 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Jumpserver 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-30 11:52+0800\n" +"POT-Creation-Date: 2019-10-30 14:51+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -2534,8 +2534,8 @@ msgid "review_login_confirmation_settings" msgstr "" #: authentication/models.py:53 -msgid "User login request: {}" -msgstr "用户登录请求: {}" +msgid "User login confirm: {}" +msgstr "用户登录复核: {}" #: authentication/models.py:57 msgid "" @@ -2833,18 +2833,12 @@ msgid "Websocket server run on port: {}, you should proxy it on nginx" msgstr "" #: jumpserver/views.py:241 -#, fuzzy -#| msgid "" -#| "
Luna is a separately deployed program, you need to deploy Luna, " -#| "koko, configure nginx for url distribution,
If you see this " -#| "page, prove that you are not accessing the nginx listening port. Good " -#| "luck." msgid "" "
Koko is a separately deployed program, you need to deploy Koko, " "configure nginx for url distribution,
If you see this page, " "prove that you are not accessing the nginx listening port. Good luck." msgstr "" -"
Luna是单独部署的一个程序，你需要部署luna，koko,
如果你看到了" +"
Koko是单独部署的一个程序，你需要部署Koko, 并确保nginx配置转发,
如果你看到了" "这个页面，证明你访问的不是nginx监听的端口，祝你好运
" #: ops/api/celery.py:54 @@ -2853,7 +2847,7 @@ msgstr "等待任务开始" #: ops/api/command.py:35 msgid "Not has host {} permission" -msgstr "" +msgstr "没有该主机 {} 权限" #: ops/models/adhoc.py:38 msgid "Interval" @@ -3262,6 +3256,51 @@ msgstr "拒绝" msgid "this order" msgstr "这个工单" +#: orders/signals_handler.py:21 +#, fuzzy +#| msgid "New node" +msgid "New order" +msgstr "新节点" + +# msgid "Update user" +# msgstr "更新用户" +#: orders/signals_handler.py:24 +#, fuzzy, python-brace-format +msgid "" +"\n" +"
\n" +"

Your has a new order

\n" +"
\n" +" Title: {order.title}\n" +"
\n" +" User: {user}\n" +"
\n" +" City: {order.city}\n" +"
\n" +" IP: {order.ip}\n" +"
\n" +" click here to review \n" +"
\n" +"
\n" +" " +msgstr "" +"\n" +"
\n" +"

您有一个新工单

\n" +"
\n" +" 标题: {order.title}\n" +"
\n" +" 用户: {user}\n" +"
\n" +" 城市: {order.city}\n" +"
\n" +" IP: {order.ip}\n" +"
\n" +" 点我查看 \n" +"
\n" +"
\n" +" " + #: orders/templates/orders/login_confirm_order_detail.html:75 msgid "ago" msgstr "前" diff --git a/apps/orders/api.py b/apps/orders/api.py index a588dd684..aec04ad46 100644 --- a/apps/orders/api.py +++ b/apps/orders/api.py @@ -12,6 +12,7 @@ from .models import LoginConfirmOrder class LoginConfirmOrderViewSet(CommonApiMixin, viewsets.ModelViewSet): serializer_class = serializers.LoginConfirmOrderSerializer permission_classes = (IsValidUser,) + filter_fields = ['status', 'title'] search_fields = ['user_display', 'title', 'ip', 'city'] def get_queryset(self): diff --git a/apps/orders/templates/orders/login_confirm_order_list.html b/apps/orders/templates/orders/login_confirm_order_list.html index e21fb8c9f..e7b8da90c 100644 --- a/apps/orders/templates/orders/login_confirm_order_list.html +++ b/apps/orders/templates/orders/login_confirm_order_list.html @@ -1,7 +1,8 @@ {% extends '_base_list.html' %} {% load i18n static %} {% block table_search %} - +{% endblock %} +{% block custom_head_css_js %} {% endblock %} {% block table_container %} @@ -22,6 +23,7 @@
+{% include '_filter_dropdown.html' %} {% endblock %} {% block content_bottom_left %}{% endblock %} {% block custom_foot_js %} @@ -30,6 +32,7 @@ var orderTable = 0; function initTable() { var options = { ele: $('#login_confirm_order_list_table'), + oSearch: {sSearch: "status:pending"}, columnDefs: [ {targets: 1, createdCell: function (td, cellData, rowData) { cellData = htmlEscape(cellData); @@ -79,6 +82,17 @@ function initTable() { $(document).ready(function(){ initTable(); + $('') + var menu = [ + {title: "IP", value: "ip"}, + {title: "{% trans 'Title' %}", value: "title"}, + {title: "{% trans 'Status' %}", value: "status", submenu: [ + {title: "{% trans 'Pending' %}", value: "pending"}, + {title: "{% trans 'Accepted' %}", value: "accepted"}, + {title: "{% trans 'Rejected' %}", value: "rejected"} + ]} + ]; + initTableFilterDropdown('#login_confirm_order_list_table_filter input', menu) }).on('click', '.expired', function () { var msg = '{% trans "User is expired" %}'; toastr.error(msg) diff --git a/apps/static/css/jumpserver.css b/apps/static/css/jumpserver.css index 02e738d24..ffcb87d33 100644 --- a/apps/static/css/jumpserver.css +++ b/apps/static/css/jumpserver.css @@ -474,3 +474,83 @@ span.select2-selection__placeholder { .p-r-5 { padding-right: 5px; } + +.dropdown-submenu { + position: relative; +} + +.dropdown-submenu>.dropdown-menu { + top: 0; + left: 100%; + margin-top: -6px; + margin-left: -1px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px; + border-radius: 0 6px 6px 6px; +} + +.dropdown-submenu:hover>.dropdown-menu { + display: block; +} + +.dropdown-submenu>a:after { + display: block; + content: " "; + float: right; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; + border-width: 5px 0 5px 5px; + border-left-color: #ccc; + margin-top: 5px; + margin-right: -10px; +} + +.dropdown-submenu:hover>a:after { + border-left-color: #fff; +} + +.dropdown-submenu.pull-left { + float: none; +} + +.dropdown-submenu.pull-left>.dropdown-menu { + left: -100px; + margin-left: 10px; + -webkit-border-radius: 6px 0 6px 6px; + -moz-border-radius: 6px 0 6px 6px; + border-radius: 6px 0 6px 6px; +} + + +.bootstrap-tagsinput { + border: 1px solid #e5e6e7; + box-shadow: none; + padding: 4px 6px; + cursor: text; +} + +/*.bootstrap-tagsinput {*/ +/* background-color: #fff;*/ +/* border: 1px solid #ccc;*/ +/* box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);*/ +/* display: inline-block;*/ +/* color: #555;*/ +/* vertical-align: middle;*/ +/* border-radius: 4px;*/ +/* max-width: 100%;*/ +/* line-height: 22px;*/ +/*}*/ + +.bootstrap-tagsinput input { + border: none; + box-shadow: none; + outline: none; + background-color: transparent; + padding: 0 6px; + margin: 0; + width: auto; + height: 22px; + max-width: inherit; +} diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js index edea12c5b..89ac43364 100644 --- a/apps/static/js/jumpserver.js +++ b/apps/static/js/jumpserver.js @@ -611,16 +611,21 @@ jumpserver.initServerSideDataTable = function (options) { style: select_style, selector: 'td:first-child' }; + var dom = '<"#uc.pull-left"> <"pull-right"<"inline"l> <"#fb.inline"> <"inline"f><"#fa.inline">>' + + 'tr' + + '<"row m-t"<"col-md-8"<"#op.col-md-6"><"col-md-6 text-center"i>><"col-md-4"p>>'; var table = ele.DataTable({ pageLength: options.pageLength || 15, // dom: options.dom || '<"#uc.pull-left">fltr<"row m-t"<"col-md-8"<"#op.col-md-6"><"col-md-6 text-center"i>><"col-md-4"p>>', - dom: options.dom || '<"#uc.pull-left"><"pull-right"<"inline"l><"#fb.inline"><"inline"f><"#fa.inline">>tr<"row m-t"<"col-md-8"<"#op.col-md-6"><"col-md-6 text-center"i>><"col-md-4"p>>', + // dom: options.dom || '<"#uc.pull-left"><"pull-right"<"inline"l><"#fb.inline"><"inline"<"table-filter"f>><"#fa.inline">>tr<"row m-t"<"col-md-8"<"#op.col-md-6"><"col-md-6 text-center"i>><"col-md-4"p>>', + dom: dom, order: options.order || [], buttons: [], columnDefs: columnDefs, serverSide: true, processing: true, searchDelay: 800, + oSearch: options.oSearch, ajax: { url: options.ajax_url, error: function (jqXHR, textStatus, errorThrown) { diff --git a/apps/templates/_filter_dropdown.html b/apps/templates/_filter_dropdown.html new file mode 100644 index 000000000..e99ca79ef --- /dev/null +++ b/apps/templates/_filter_dropdown.html @@ -0,0 +1,81 @@ + + +