From c54510deb0018fd41bca985dfaee79038f7d5453 Mon Sep 17 00:00:00 2001 From: Apex Liu Date: Wed, 18 Apr 2018 13:44:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=87=A0=E5=A4=84=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E5=B8=B8=E7=9A=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../teleport/static/js/maintenance/install.js | 2 +- server/www/teleport/static/js/ops/auz-info.js | 24 +++++++++++++++++++ .../www/teleport/static/js/teleport/common.js | 6 ++--- .../teleport/static/js/teleport/controls.js | 2 +- .../teleport/static/js/user/reset-password.js | 2 +- .../teleport/view/maintenance/install.mako | 2 +- server/www/teleport/view/user/user-list.mako | 2 +- .../teleport/webroot/app/controller/group.py | 2 +- 8 files changed, 33 insertions(+), 9 deletions(-) diff --git a/server/www/teleport/static/js/maintenance/install.js b/server/www/teleport/static/js/maintenance/install.js index 9f69388..8e8c857 100644 --- a/server/www/teleport/static/js/maintenance/install.js +++ b/server/www/teleport/static/js/maintenance/install.js @@ -30,7 +30,7 @@ $app.on_init = function (cb_stack, cb_args) { var _t = []; _t.push('
'); - _t.push(' 注意：请确保您在执行后续创建操作之前，已经在MySQL中使用 UTF8字符集 创建了库“'); + _t.push(' 注意：请确保您在执行后续创建操作之前，已经在MySQL中使用 UTF8字符集 创建了库“'); _t.push($app.options.db.mysql_db); _t.push('”，并且用户“'); _t.push($app.options.db.mysql_user); diff --git a/server/www/teleport/static/js/ops/auz-info.js b/server/www/teleport/static/js/ops/auz-info.js index 14681c6..f70246e 100644 --- a/server/www/teleport/static/js/ops/auz-info.js +++ b/server/www/teleport/static/js/ops/auz-info.js @@ -1133,6 +1133,10 @@ $app.create_dlg_sel_user = function () { dlg.on_add = function () { var items = dlg.get_selected_items(); + if(items.length === 0) { + $tp.notify_error('请先选择要添加的操作者！'); + return; + } $tp.ajax_post_json('/ops/policy/add-members', { policy_id: $app.options.policy_id, @@ -1272,6 +1276,10 @@ $app.create_dlg_sel_user_group = function () { dlg.on_add = function () { var items = dlg.get_selected_items(); + if(items.length === 0) { + $tp.notify_error('请先选择要添加的操作者！'); + return; + } $tp.ajax_post_json('/ops/policy/add-members', { policy_id: $app.options.policy_id, @@ -1453,6 +1461,10 @@ $app.create_dlg_sel_acc = function () { dlg.on_add = function () { var items = dlg.get_selected_items(); + if(items.length === 0) { + $tp.notify_error('请先选择要添加的资产！'); + return; + } $tp.ajax_post_json('/ops/policy/add-members', { policy_id: $app.options.policy_id, @@ -1592,6 +1604,10 @@ $app.create_dlg_sel_acc_group = function () { dlg.on_add = function () { var items = dlg.get_selected_items(); + if(items.length === 0) { + $tp.notify_error('请先选择要添加的资产！'); + return; + } $tp.ajax_post_json('/ops/policy/add-members', { policy_id: $app.options.policy_id, @@ -1753,6 +1769,10 @@ $app.create_dlg_sel_host = function () { dlg.on_add = function () { var items = dlg.get_selected_items(); + if(items.length === 0) { + $tp.notify_error('请先选择要添加的资产！'); + return; + } $tp.ajax_post_json('/ops/policy/add-members', { policy_id: $app.options.policy_id, @@ -1893,6 +1913,10 @@ $app.create_dlg_sel_host_group = function () { dlg.on_add = function () { var items = dlg.get_selected_items(); + if(items.length === 0) { + $tp.notify_error('请先选择要添加的资产！'); + return; + } $tp.ajax_post_json('/ops/policy/add-members', { policy_id: $app.options.policy_id, diff --git a/server/www/teleport/static/js/teleport/common.js b/server/www/teleport/static/js/teleport/common.js index dd22763..4d2bd2f 100644 --- a/server/www/teleport/static/js/teleport/common.js +++ b/server/www/teleport/static/js/teleport/common.js @@ -11,7 +11,7 @@ $tp.notify_error = function (message_, title_, timeout_) { //sticky:true, class_name: 'gritter-error', time: _t, - title: ' 错误：' + _title, + title: ' 错误：' + _title, text: message_ }); console.error('错误', _title, message_); @@ -58,7 +58,7 @@ $tp.disable_dom = function (dom_selector, message) { html.push('
'); var has_message = false; if (!_.isUndefined(message) && !_.isNull(message) && message.length > 0) { - html.push('
' + message + '
'); + html.push('
' + message + '
'); has_message = true; } @@ -97,7 +97,7 @@ $tp.disable_dom = function (dom_selector, message) { $tp.dlg_confirm = function (cb_stack, cb_args) { var self = {}; self._cb_stack = cb_stack; - self._title = cb_args.title || ' 操作确认'; + self._title = cb_args.title || ' 操作确认'; self._msg = cb_args.msg || ''; self._btn_yes = cb_args.btn_yes || '确定'; self._btn_no = cb_args.btn_no || '取消'; diff --git a/server/www/teleport/static/js/teleport/controls.js b/server/www/teleport/static/js/teleport/controls.js index ae40a1d..964d52a 100644 --- a/server/www/teleport/static/js/teleport/controls.js +++ b/server/www/teleport/static/js/teleport/controls.js @@ -688,7 +688,7 @@ $tp.create_table = function (options) { _tbl.loading_timer = null; } - var msg_loading = ' 糟糕！加载失败了...'; + var msg_loading = ' 糟糕！加载失败了...'; $('#' + _tbl.dom_id + ' tbody').empty().append($(msg_loading)) }; diff --git a/server/www/teleport/static/js/user/reset-password.js b/server/www/teleport/static/js/user/reset-password.js index 5f09dc6..f303205 100644 --- a/server/www/teleport/static/js/user/reset-password.js +++ b/server/www/teleport/static/js/user/reset-password.js @@ -100,7 +100,7 @@ $app.on_init = function (cb_stack) { $app.dom.find.input_username.focus(); } else if ($app.options.mode === 2) { // show 'error' page - $app.dom.icon_bg.addClass('fa fa-warning').css('color', '#ff6242'); + $app.dom.icon_bg.addClass('fas fa-exclamation-triangle').css('color', '#ff6242'); if ($app.options.code === TPE_NOT_EXISTS) { $app.dom.title.text('链接无效'); $app.dom.error.message.html('当前使用的密码重置链接无效，可能已经因过期而被清除！密码重置链接仅在24小时内有效，请及时设置您的新密码！'); diff --git a/server/www/teleport/view/maintenance/install.mako b/server/www/teleport/view/maintenance/install.mako index 328f52a..8117ccc 100644 --- a/server/www/teleport/view/maintenance/install.mako +++ b/server/www/teleport/view/maintenance/install.mako @@ -38,7 +38,7 @@

TELEPORT支持 SQLite 和 MySQL 数据库，您目前使用的配置如下：

- 注意：如果以上配置并不是您所期望的，请修改您的配置文件，然后刷新本页面。 + 注意：如果以上配置并不是您所期望的，请修改您的配置文件，然后刷新本页面。 如何设置配置文件？
diff --git a/server/www/teleport/view/user/user-list.mako b/server/www/teleport/view/user/user-list.mako index b45a582..fc45446 100644 --- a/server/www/teleport/view/user/user-list.mako +++ b/server/www/teleport/view/user/user-list.mako @@ -266,7 +266,7 @@
- 用户未设置邮箱，密码重置邮件功能无法使用，请使用手动重置方式。 + 用户未设置邮箱，密码重置邮件功能无法使用，请使用手动重置方式。
diff --git a/server/www/teleport/webroot/app/controller/group.py b/server/www/teleport/webroot/app/controller/group.py index b24b0ec..36e975c 100644 --- a/server/www/teleport/webroot/app/controller/group.py +++ b/server/www/teleport/webroot/app/controller/group.py @@ -151,7 +151,7 @@ class DoGetGroupsHandler(TPBaseJsonHandler): except: return self.write_json(TPE_JSON_FORMAT) - print('---get groups:', args) + # print('---get groups:', args) sql_filter = {} sql_order = dict()