mirror of https://github.com/jumpserver/jumpserver
fit2bot
GitHub
parent
60703c920c
commit
04f4ecb3d1
|
|
@ -143,4 +143,3 @@ class AccountHistoriesSecretAPI(ExtraFilterFieldsMixin, RecordViewLogMixin, List
|
|||
return histories
|
||||
histories = histories.exclude(history_id=latest_history.history_id)
|
||||
return histories
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,15 @@ class ExtraFilterFieldsMixin:
|
|||
extra_filter_fields = []
|
||||
extra_filter_backends = []
|
||||
|
||||
def set_compatible_fields(self):
|
||||
"""
|
||||
兼容老的 filter_fields
|
||||
"""
|
||||
if not hasattr(self, 'filter_fields') and hasattr(self, 'filterset_fields'):
|
||||
self.filter_fields = self.filterset_fields
|
||||
|
||||
def get_filter_backends(self):
|
||||
self.set_compatible_fields()
|
||||
if self.filter_backends != self.__class__.filter_backends:
|
||||
return self.filter_backends
|
||||
backends = list(chain(
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f87b3d05a2f665ef21a4876b9af8ba651936220b35633d1dc6a93941000bd253
|
||||
size 154676
|
||||
oid sha256:d9efbbfac755784f3aba000f8e56fe697eb983b0157b832e4ae9970b477bd916
|
||||
size 154962
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2023-08-22 13:39+0800\n"
|
||||
"POT-Creation-Date: 2023-08-17 18:24+0800\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -4909,41 +4909,41 @@ msgstr "企業微信認証の有効化"
|
|||
msgid "Site url"
|
||||
msgstr "サイトURL"
|
||||
|
||||
#: settings/serializers/basic.py:10
|
||||
#: settings/serializers/basic.py:11
|
||||
msgid ""
|
||||
"Email links or other system callbacks are used to access it, eg: http://dev."
|
||||
"jumpserver.org:8080"
|
||||
msgstr ""
|
||||
"External URL, email links or other system callbacks are used to access it, "
|
||||
"eg: http://dev.jumpserver.org:8080"
|
||||
msgstr "外部URL、メールリンクまたは他のシステムコールバックにアクセスするには、http://dev.jumpserver.org:8080などを使用します"
|
||||
|
||||
#: settings/serializers/basic.py:13
|
||||
#: settings/serializers/basic.py:16
|
||||
msgid "User guide url"
|
||||
msgstr "ユーザーガイドurl"
|
||||
|
||||
#: settings/serializers/basic.py:14
|
||||
#: settings/serializers/basic.py:17
|
||||
msgid "User first login update profile done redirect to it"
|
||||
msgstr "ユーザーの最初のログイン更新プロファイルがリダイレクトされました"
|
||||
|
||||
#: settings/serializers/basic.py:17
|
||||
#: settings/serializers/basic.py:20
|
||||
msgid "Global organization name"
|
||||
msgstr "グローバル組織名"
|
||||
|
||||
#: settings/serializers/basic.py:18
|
||||
#: settings/serializers/basic.py:21
|
||||
msgid "The name of global organization to display"
|
||||
msgstr "表示するグローバル組織の名前"
|
||||
|
||||
#: settings/serializers/basic.py:21
|
||||
#: settings/serializers/basic.py:24
|
||||
msgid "Help Docs URL"
|
||||
msgstr "ドキュメントリンク"
|
||||
|
||||
#: settings/serializers/basic.py:22
|
||||
#: settings/serializers/basic.py:25
|
||||
msgid "default: http://docs.jumpserver.org"
|
||||
msgstr "デフォルト: http://docs.jumpserver.org"
|
||||
|
||||
#: settings/serializers/basic.py:25
|
||||
#: settings/serializers/basic.py:28
|
||||
msgid "Help Support URL"
|
||||
msgstr "サポートリンク"
|
||||
|
||||
#: settings/serializers/basic.py:26
|
||||
#: settings/serializers/basic.py:29
|
||||
msgid "default: http://www.jumpserver.org/support/"
|
||||
msgstr "デフォルト: http://www.jumpserver.org/support/"
|
||||
|
||||
|
|
@ -8211,3 +8211,8 @@ msgstr "究極のエディション"
|
|||
#: xpack/plugins/license/models.py:86
|
||||
msgid "Community edition"
|
||||
msgstr "コミュニティ版"
|
||||
|
||||
#, fuzzy
|
||||
#~| msgid "Internal"
|
||||
#~ msgid "External url"
|
||||
#~ msgstr "ビルトイン"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f2f7fa427404ca2b2f5651cb1be3e84876dad9d72f14e488321a2dc84d4f4051
|
||||
size 126472
|
||||
oid sha256:12935fb4f142398ebf74c775dc0f0b094b22cd5dc4e379882a65ef220914d459
|
||||
size 126702
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: JumpServer 0.3.3\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2023-08-22 13:39+0800\n"
|
||||
"POT-Creation-Date: 2023-08-17 18:24+0800\n"
|
||||
"PO-Revision-Date: 2021-05-20 10:54+0800\n"
|
||||
"Last-Translator: ibuler <ibuler@qq.com>\n"
|
||||
"Language-Team: JumpServer team<ibuler@qq.com>\n"
|
||||
|
|
@ -4863,41 +4863,41 @@ msgstr "启用企业微信认证"
|
|||
msgid "Site url"
|
||||
msgstr "当前站点 URL"
|
||||
|
||||
#: settings/serializers/basic.py:10
|
||||
#: settings/serializers/basic.py:11
|
||||
msgid ""
|
||||
"Email links or other system callbacks are used to access it, eg: http://dev."
|
||||
"jumpserver.org:8080"
|
||||
msgstr ""
|
||||
"External URL, email links or other system callbacks are used to access it, "
|
||||
"eg: http://dev.jumpserver.org:8080"
|
||||
msgstr "外部可访问的 URL, 用于邮件链接或其它系统回调, 例如: http://dev.jumpserver.org:8080"
|
||||
|
||||
#: settings/serializers/basic.py:13
|
||||
#: settings/serializers/basic.py:16
|
||||
msgid "User guide url"
|
||||
msgstr "用户向导URL"
|
||||
|
||||
#: settings/serializers/basic.py:14
|
||||
#: settings/serializers/basic.py:17
|
||||
msgid "User first login update profile done redirect to it"
|
||||
msgstr "用户第一次登录，修改profile后重定向到地址, 可以是 wiki 或 其他说明文档"
|
||||
|
||||
#: settings/serializers/basic.py:17
|
||||
#: settings/serializers/basic.py:20
|
||||
msgid "Global organization name"
|
||||
msgstr "全局组织名"
|
||||
|
||||
#: settings/serializers/basic.py:18
|
||||
#: settings/serializers/basic.py:21
|
||||
msgid "The name of global organization to display"
|
||||
msgstr "全局组织的显示名称，默认为 全局组织"
|
||||
|
||||
#: settings/serializers/basic.py:21
|
||||
#: settings/serializers/basic.py:24
|
||||
msgid "Help Docs URL"
|
||||
msgstr "文档链接"
|
||||
|
||||
#: settings/serializers/basic.py:22
|
||||
#: settings/serializers/basic.py:25
|
||||
msgid "default: http://docs.jumpserver.org"
|
||||
msgstr "默认: http://dev.jumpserver.org:8080"
|
||||
|
||||
#: settings/serializers/basic.py:25
|
||||
#: settings/serializers/basic.py:28
|
||||
msgid "Help Support URL"
|
||||
msgstr "支持链接"
|
||||
|
||||
#: settings/serializers/basic.py:26
|
||||
#: settings/serializers/basic.py:29
|
||||
msgid "default: http://www.jumpserver.org/support/"
|
||||
msgstr "默认: http://www.jumpserver.org/support/"
|
||||
|
||||
|
|
@ -8100,3 +8100,7 @@ msgstr "旗舰版"
|
|||
#: xpack/plugins/license/models.py:86
|
||||
msgid "Community edition"
|
||||
msgstr "社区版"
|
||||
|
||||
#~| msgid "Internal"
|
||||
#~ msgid "External url"
|
||||
#~ msgstr "内置"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,10 @@ class BasicSettingSerializer(serializers.Serializer):
|
|||
|
||||
SITE_URL = serializers.URLField(
|
||||
required=True, label=_("Site url"),
|
||||
help_text=_('Email links or other system callbacks are used to access it, eg: http://dev.jumpserver.org:8080')
|
||||
help_text=_(
|
||||
'External URL, email links or other system callbacks are used to access it, '
|
||||
'eg: http://dev.jumpserver.org:8080'
|
||||
)
|
||||
)
|
||||
USER_GUIDE_URL = serializers.URLField(
|
||||
required=False, allow_blank=True, allow_null=True, label=_("User guide url"),
|
||||
|
|
|
|||
Loading…
Reference in New Issue