From 39fff235d1092d46d75016b53342f5313d53a827 Mon Sep 17 00:00:00 2001 From: ibuler Date: Sun, 14 Jan 2018 18:02:11 +0800 Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8Dcluster=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/cluster_create_update.html | 2 +- apps/assets/views/cluster.py | 2 +- .../templates/common/basic_setting.html | 1 - apps/locale/zh/LC_MESSAGES/django.mo | Bin 31604 -> 31610 bytes apps/locale/zh/LC_MESSAGES/django.po | 25 +++++++++--------- apps/templates/_nav.html | 2 +- apps/users/templates/users/user_profile.html | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apps/assets/templates/assets/cluster_create_update.html b/apps/assets/templates/assets/cluster_create_update.html index 38fc6e3de..66c36bece 100644 --- a/apps/assets/templates/assets/cluster_create_update.html +++ b/apps/assets/templates/assets/cluster_create_update.html @@ -38,7 +38,7 @@ {% bootstrap_field form.contact layout="horizontal" %} {% bootstrap_field form.phone layout="horizontal" %} -

{% trans 'Settings' %}

+

{% trans 'Setting' %}

{% bootstrap_field form.admin_user layout="horizontal" %} {% bootstrap_field form.system_users layout="horizontal" %} diff --git a/apps/assets/views/cluster.py b/apps/assets/views/cluster.py index e1a2f6fba..835229fc1 100644 --- a/apps/assets/views/cluster.py +++ b/apps/assets/views/cluster.py @@ -46,7 +46,7 @@ class ClusterCreateView(AdminUserRequiredMixin, SuccessMessageMixin, CreateView) return super().get_context_data(**kwargs) def form_valid(self, form): - cluster = form.save(commit=False) + cluster = form.save() cluster.created_by = self.request.user.username cluster.save() return super().form_valid(form) diff --git a/apps/common/templates/common/basic_setting.html b/apps/common/templates/common/basic_setting.html index e24f1d6a8..fb5039795 100644 --- a/apps/common/templates/common/basic_setting.html +++ b/apps/common/templates/common/basic_setting.html @@ -52,7 +52,6 @@
-
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 9b898fe2fa4192e3ad0847f32f3b2e9448a632c4..5b01e493bc366126e93b5de9115b6256c4691b6c 100644 GIT binary patch delta 1192 zcmXZaUuey77{~G7+A-FSnZudMX|r9huvT)h%>_-F6mI;9)RHD;j-NiES>cCof-r0gUvcz^spSFi8$e4p?0eSUv_7K(lsiXQAwh4CN= z20DUZ4rXx;-a+NxU<^NE2~OB)`yEwRz$6xTM)gavl(-sot{xNEh^lYJD%{Z-g#QzV zoan{`8<*{EJA^tof@(PGcnnt(Pva`A$V9G3)u(O7_F*~sOSk~DnJ{WNNJ5QsE_`Z7 z?5OuA98Y5{^|Q_|>EbDgtFaE-P)~To_M-;MVgm1D1wIQ|)UbGsYA}OpP}v8L>s&LeI_HEKe=fmYNv+kzT& zuT7&a&R`4nqx$7h=ihpN%zm|hw9oxPSx?k3Y3oo88&N;m2Imhre;kwK&pN(p@1iao zLJgQl4f4wS<5)%f4OKVyOb~>6H49nj+g71AQmFh2RHFvl;(VLkj;i0~xE)s$r|lIy tOq@skg!R2qzuop=FW0ESiQI?fv2{gFx$&J3QzcWm;i=)9xq*(!(tkE#s;dA1 delta 1185 zcmXZaPe@cz6vy#9q@rnQW6Fd>nH#fgle$O@GJRop7Dkj%Q1t!veyh(t=bm@&dGEg8bBP~wiLu@3s4RqV zsV{_59L83>iBi12XP_!b6AbT*(h!}LPCx2y6}M= zw-erfm1N#359_0_yn}-k-G7_NVqaKa`$|8&=yis$mQ2CtK_MF6R$o9r*#r7ws+7 zfupDa3#dV!djBn^h(Dw15`)~oK20SH-E9)JQIEo!F$2)NqamHT2 nL&OEtPuP@;`)#v(avY-uhx6|mOWG41`42t!)A_4?(-r>!vMi*q diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 9b596a275..2c7f39971 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: 2018-01-12 15:51+0800\n" +"POT-Creation-Date: 2018-01-12 18:51+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -1107,10 +1107,10 @@ msgstr "选择资产" msgid "Task has been send, seen left assets status" msgstr "任务已下发，查看左侧资产状态" -#: assets/templates/assets/cluster_create_update.html:41 common/views.py:17 -#: common/views.py:44 common/views.py:69 templates/_nav.html:74 +#: assets/templates/assets/cluster_create_update.html:41 +#: users/templates/users/reset_password.html:57 #: users/templates/users/user_profile.html:20 -msgid "Settings" +msgid "Setting" msgstr "设置" #: assets/templates/assets/cluster_list.html:11 assets/views/cluster.py:43 @@ -1409,6 +1409,11 @@ msgstr "LDAP设置" msgid "Test connection" msgstr "测试连接" +#: common/views.py:17 common/views.py:44 common/views.py:69 +#: templates/_nav.html:69 +msgid "Settings" +msgstr "系统设置" + #: common/views.py:30 common/views.py:55 common/views.py:80 msgid "Update setting successfully" msgstr "更新设置成功" @@ -1955,14 +1960,14 @@ msgstr "离线会话" msgid "Command" msgstr "命令" -#: templates/_nav.html:56 templates/_nav_user.html:14 -msgid "Web terminal" -msgstr "Web终端" - #: templates/_nav_user.html:4 msgid "My assets" msgstr "我的资产" +#: templates/_nav_user.html:14 +msgid "Web terminal" +msgstr "Web终端" + #: templates/captcha/image.html:3 msgid "Play CAPTCHA as audio file" msgstr "语言播放验证码" @@ -2423,10 +2428,6 @@ msgstr "重置密码" msgid "Password again" msgstr "再次输入密码" -#: users/templates/users/reset_password.html:57 -msgid "Setting" -msgstr "设置" - #: users/templates/users/user_create.html:4 #: users/templates/users/user_list.html:16 users/views/user.py:72 msgid "Create user" diff --git a/apps/templates/_nav.html b/apps/templates/_nav.html index eec72cf04..39b14add8 100644 --- a/apps/templates/_nav.html +++ b/apps/templates/_nav.html @@ -65,7 +65,7 @@ {# #} {##}
  • - + {% trans 'Settings' %}
    • \ No newline at end of file diff --git a/apps/users/templates/users/user_profile.html b/apps/users/templates/users/user_profile.html index 99f5ca6e1..8b26c943d 100644 --- a/apps/users/templates/users/user_profile.html +++ b/apps/users/templates/users/user_profile.html @@ -17,7 +17,7 @@ {% trans 'Profile' %}
  • - {% trans 'Settings' %} + {% trans 'Setting' %}