diff --git a/apps/common/tree.py b/apps/common/tree.py index 1ffe4347e..fbade582e 100644 --- a/apps/common/tree.py +++ b/apps/common/tree.py @@ -98,4 +98,5 @@ class TreeNodeSerializer(serializers.Serializer): isParent = serializers.BooleanField(default=False) open = serializers.BooleanField(default=False) iconSkin = serializers.CharField(max_length=128, allow_blank=True) + nocheck = serializers.BooleanField(default=False) meta = serializers.JSONField() diff --git a/apps/jumpserver/context_processor.py b/apps/jumpserver/context_processor.py index 7879edeb4..0fbef047f 100644 --- a/apps/jumpserver/context_processor.py +++ b/apps/jumpserver/context_processor.py @@ -15,7 +15,7 @@ def jumpserver_processor(request): 'FAVICON_URL': static('img/facio.ico'), 'JMS_TITLE': 'Jumpserver', 'VERSION': settings.VERSION, - 'COPYRIGHT': 'FIT2CLOUD 飞致云' + ' © 2014-2019', + 'COPYRIGHT': 'FIT2CLOUD 飞致云' + ' © 2014-2020', 'SECURITY_COMMAND_EXECUTION': settings.SECURITY_COMMAND_EXECUTION, 'SECURITY_MFA_VERIFY_TTL': settings.SECURITY_MFA_VERIFY_TTL, 'FORCE_SCRIPT_NAME': settings.FORCE_SCRIPT_NAME, diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 6f0403044..89354bcf1 100644 Binary files a/apps/locale/zh/LC_MESSAGES/django.mo and b/apps/locale/zh/LC_MESSAGES/django.mo differ diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index e5aa99da6..867ddeb78 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: 2020-01-14 16:52+0800\n" +"POT-Creation-Date: 2020-01-15 12:40+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -3222,33 +3222,37 @@ msgstr "任务列表" msgid "Go" msgstr "" -#: ops/templates/ops/command_execution_create.html:179 +#: ops/templates/ops/command_execution_create.html:159 +msgid "Asset configuration does not include the SSH protocol" +msgstr "资产配置不包含 SSH 协议" + +#: ops/templates/ops/command_execution_create.html:183 msgid "Selected assets" msgstr "已选择资产" -#: ops/templates/ops/command_execution_create.html:182 +#: ops/templates/ops/command_execution_create.html:186 msgid "In total" msgstr "总共" -#: ops/templates/ops/command_execution_create.html:219 +#: ops/templates/ops/command_execution_create.html:223 msgid "" "Select the left asset, select the running system user, execute command in " "batch" msgstr "选择左侧资产, 选择运行的系统用户,批量执行命令" -#: ops/templates/ops/command_execution_create.html:263 +#: ops/templates/ops/command_execution_create.html:267 msgid "Unselected assets" msgstr "没有选中资产" -#: ops/templates/ops/command_execution_create.html:267 +#: ops/templates/ops/command_execution_create.html:271 msgid "No input command" msgstr "没有输入命令" -#: ops/templates/ops/command_execution_create.html:271 +#: ops/templates/ops/command_execution_create.html:275 msgid "No system user was selected" msgstr "没有选择系统用户" -#: ops/templates/ops/command_execution_create.html:281 +#: ops/templates/ops/command_execution_create.html:285 msgid "Pending" msgstr "等待" diff --git a/apps/ops/templates/ops/command_execution_create.html b/apps/ops/templates/ops/command_execution_create.html index 7b4d254f6..8912cbe71 100644 --- a/apps/ops/templates/ops/command_execution_create.html +++ b/apps/ops/templates/ops/command_execution_create.html @@ -86,7 +86,7 @@