From 2208320049ef271466301d7ae5658fcb915abce5 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 2 Aug 2019 19:49:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9elfinder=E4=B8=AD?= =?UTF-8?q?=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/static/plugins/elfinder/i18n/elfinder.zh_CN.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/static/plugins/elfinder/i18n/elfinder.zh_CN.js b/apps/static/plugins/elfinder/i18n/elfinder.zh_CN.js index 44f5fe8dc..a80e7c4b5 100755 --- a/apps/static/plugins/elfinder/i18n/elfinder.zh_CN.js +++ b/apps/static/plugins/elfinder/i18n/elfinder.zh_CN.js @@ -422,7 +422,7 @@ 'minsLeft' : '剩余 $1 分钟', // from v2.1.17 added 13.11.2016 'openAsEncoding' : '使用所选编码重新打开', // from v2.1.19 added 2.12.2016 'saveAsEncoding' : '使用所选编码保存', // from v2.1.19 added 2.12.2016 - 'selectFolder' : '选择目录(暂不支持)', // from v2.1.20 added 13.12.2016 + 'selectFolder' : '选择目录', // from v2.1.20 added 13.12.2016 'firstLetterSearch': '首字母搜索', // from v2.1.23 added 24.3.2017 'presets' : '预置', // from v2.1.25 added 26.5.2017 'tooManyToTrash' : '项目太多，不能移动到回收站.', // from v2.1.25 added 9.6.2017 From afffb50b942116956cace4a1cdd4052d4f5981db Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 5 Aug 2019 10:01:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[UPdate]=20=E4=BF=AE=E6=94=B9=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E6=A8=A1=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/serializers/system_user.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/assets/serializers/system_user.py b/apps/assets/serializers/system_user.py index 70855c9f7..d7d8897b2 100644 --- a/apps/assets/serializers/system_user.py +++ b/apps/assets/serializers/system_user.py @@ -71,7 +71,9 @@ class SystemUserSerializer(AuthSerializerMixin, BulkOrgResourceModelSerializer): super().validate_password(password) auto_gen_key = self.initial_data.get("auto_generate_key", False) private_key = self.initial_data.get("private_key") - if not self.instance and not auto_gen_key and not password and not private_key: + login_mode = self.initial_data.get("login_mode") + if not self.instance and not auto_gen_key and not password and \ + not private_key and login_mode == SystemUser.LOGIN_AUTO: raise serializers.ValidationError(_("Password or private key required")) return password