From 303f88d6eecb30bb5f56657a57be86b718236951 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 21 Feb 2019 16:13:08 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0replay=20storage?= =?UTF-8?q?=20=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/replay_storage_create.html | 16 ++++++--- apps/locale/zh/LC_MESSAGES/django.mo | Bin 64361 -> 64628 bytes apps/locale/zh/LC_MESSAGES/django.po | 32 ++++++++++-------- requirements/requirements.txt | 2 +- 4 files changed, 31 insertions(+), 19 deletions(-) diff --git a/apps/common/templates/common/replay_storage_create.html b/apps/common/templates/common/replay_storage_create.html index a1781c2e3..c8f99240a 100644 --- a/apps/common/templates/common/replay_storage_create.html +++ b/apps/common/templates/common/replay_storage_create.html @@ -223,7 +223,7 @@ $(document).ready(function() { field_of_all = [name_id, host_id, port_id, bucket_id, access_key_id, secret_key_id, container_name_id, account_name_id, account_key_id, endpoint_id, endpoint_suffix_id, region_id]; need_get_field_of_server = [name_id]; - need_get_field_of_s3 = [name_id, bucket_id, access_key_id, secret_key_id, region_id, endpoint_id]; + need_get_field_of_s3 = [name_id, bucket_id, access_key_id, secret_key_id, endpoint_id]; need_get_field_of_oss = [name_id, bucket_id, access_key_id, secret_key_id, endpoint_id]; need_get_field_of_azure = [name_id, container_name_id, account_name_id, account_key_id, endpoint_suffix_id]; need_get_field_of_ceph = [name_id, host_id, port_id, bucket_id, access_key_id, secret_key_id, region_id]; @@ -239,6 +239,11 @@ $(document).ready(function() { }) .on('click', '#id_submit_button', function(){ + $('#id_error').html(''); + var submitBtn = $("#id_submit_button"); + var origin_text = submitBtn.html(); + submitBtn.addClass('disabled'); + submitBtn.html("{% trans 'Submitting' %}"); var type = $('.selector').val(); var field = getFieldByType(type); var data = {'TYPE': type}; @@ -249,13 +254,16 @@ $(document).ready(function() { var url = "{% url 'api-common:replay-storage-create' %}"; var success = function(data, textStatus) { location = "{% url 'common:terminal-setting' %}"; + submitBtn.removeClass('disabled'); + submitBtn.html(origin_text); }; var error = function(data, textStatus) { var error_msg = data.responseJSON.error; - $('#id_error').html(error_msg) + $('#id_error').html(error_msg); + submitBtn.removeClass('disabled'); + submitBtn.html(origin_text); }; - ajaxAPI(url, JSON.stringify(data), success, error) - + ajaxAPI(url, JSON.stringify(data), success, error); }) {% endblock %} diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 083ee842b8ea83c3de82be43de11bc141c54ad99..62c0858a181e640a916dd7acce79c953173e05ac 100644 GIT binary patch delta 19385 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 delta 19127 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%0D&NS$?0zM^F=8K`rDK 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 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 0410c2107..ca6e66d84 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-02-20 18:56+0800\n" +"POT-Creation-Date: 2019-02-21 15:53+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -193,7 +193,7 @@ msgstr "名称" #: perms/templates/perms/asset_permission_user.html:55 users/forms.py:15 #: users/forms.py:33 users/models/authentication.py:77 users/models/user.py:53 #: users/templates/users/_select_user_modal.html:14 -#: users/templates/users/login.html:64 users/templates/users/new_login.html:79 +#: users/templates/users/login.html:64 users/templates/users/new_login.html:85 #: users/templates/users/user_detail.html:67 #: users/templates/users/user_list.html:24 #: users/templates/users/user_profile.html:47 @@ -206,7 +206,7 @@ msgstr "密码或密钥密码" #: assets/forms/user.py:26 assets/models/base.py:24 common/forms.py:102 #: users/forms.py:17 users/forms.py:35 users/forms.py:47 -#: users/templates/users/login.html:67 users/templates/users/new_login.html:84 +#: users/templates/users/login.html:67 users/templates/users/new_login.html:90 #: users/templates/users/reset_password.html:53 #: users/templates/users/user_create.html:10 #: users/templates/users/user_password_authentication.html:18 @@ -1202,6 +1202,7 @@ msgstr "刷新" #: assets/templates/assets/asset_detail.html:308 #: users/templates/users/user_detail.html:307 #: users/templates/users/user_detail.html:334 +#: xpack/plugins/interface/views.py:31 msgid "Update successfully!" msgstr "更新成功" @@ -2262,6 +2263,10 @@ msgstr "宁夏: cn-northwest-1" msgid "More" msgstr "更多" +#: common/templates/common/replay_storage_create.html:246 +msgid "Submitting" +msgstr "提交中" + #: common/templates/common/security_setting.html:46 msgid "Password check rule" msgstr "密码校验规则" @@ -2833,7 +2838,7 @@ msgid "Logout" msgstr "注销登录" #: templates/_header_bar.html:101 users/templates/users/login.html:46 -#: users/templates/users/login.html:72 users/templates/users/new_login.html:90 +#: users/templates/users/login.html:72 users/templates/users/new_login.html:96 msgid "Login" msgstr "登录" @@ -2979,7 +2984,7 @@ msgstr "验证码" #: templates/flash_message_standalone.html:35 #: users/templates/users/login.html:27 users/templates/users/login_otp.html:27 -#: users/templates/users/new_login.html:50 +#: users/templates/users/new_login.html:56 #: users/templates/users/reset_password.html:25 msgid "Welcome to the Jumpserver open source fortress" msgstr "欢迎使用Jumpserver开源堡垒机" @@ -3351,7 +3356,7 @@ msgid "" msgstr "你可以使用ssh客户端工具连接终端" #: users/api/auth.py:40 users/templates/users/login.html:52 -#: users/templates/users/new_login.html:65 +#: users/templates/users/new_login.html:71 msgid "Log in frequently and try again later" msgstr "登录频繁, 稍后重试" @@ -3736,7 +3741,7 @@ msgstr "获取更多信息" #: users/templates/users/forgot_password.html:11 #: users/templates/users/forgot_password.html:31 -#: users/templates/users/login.html:83 users/templates/users/new_login.html:94 +#: users/templates/users/login.html:83 users/templates/users/new_login.html:100 msgid "Forgot password" msgstr "忘记密码" @@ -3776,11 +3781,11 @@ msgstr "" msgid "Changes the world, starting with a little bit." msgstr "改变世界，从一点点开始。" -#: users/templates/users/login.html:54 users/templates/users/new_login.html:67 +#: users/templates/users/login.html:54 users/templates/users/new_login.html:73 msgid "The user password has expired" msgstr "用户密码已过期" -#: users/templates/users/login.html:57 users/templates/users/new_login.html:70 +#: users/templates/users/login.html:57 users/templates/users/new_login.html:76 msgid "Captcha invalid" msgstr "验证码错误" @@ -3820,11 +3825,7 @@ msgstr "6位数字" msgid "Can't provide security? Please contact the administrator!" msgstr "如果不能提供MFA验证码，请联系管理员!" -#: users/templates/users/new_login.html:15 -msgid "Login Jumpserver" -msgstr "登录 Jumpserver" - -#: users/templates/users/new_login.html:55 +#: users/templates/users/new_login.html:61 msgid "Welcome back, please enter username and password to login" msgstr "欢迎回来，请输入用户名和密码登录" @@ -4879,6 +4880,9 @@ msgstr "创建组织" msgid "Update org" msgstr "更新组织" +#~ msgid "Login Jumpserver" +#~ msgstr "登录 Jumpserver" + #, fuzzy #~| msgid "Delete succeed" #~ msgid "Delete success！" diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 5002762c9..b6be63a29 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -60,7 +60,7 @@ pytz==2018.3 PyYAML==3.12 redis==2.10.6 requests==2.18.4 -jms-storage==0.0.20 +jms-storage==0.0.21 s3transfer==0.1.13 simplejson==3.13.2 six==1.11.0