Skip to content

Commit 091cf39

Browse files
ibuleribuler
committed
[Bugfix] ldap可以修改密码问题，platform大小写问题
1 parent 0df7c69 commit 091cf39

6 files changed

Lines changed: 159 additions & 141 deletions

File tree

‎apps/assets/views/asset.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,8 @@ def form_valid(self, form):
277277
v = ''
278278
elif k == 'domain':
279279
v = get_object_or_none(Domain, name=v)
280-
280+
elif k == 'platform':
281+
v = v.lower().capitalize()
281282
if v != '':
282283
asset_dict[k] = v
283284

‎apps/common/forms.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ class BasicSettingForm(BaseForm):
6969
)
7070
EMAIL_SUBJECT_PREFIX = forms.CharField(
7171
max_length=1024, label=_("Email Subject Prefix"),
72+
help_text=_("Tips: Some word will be intercept by mail provider")
7273
)
7374

7475

‎apps/jumpserver/settings.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ def get_xpack_templates_dir():
314314
EMAIL_HOST_PASSWORD = ''
315315
EMAIL_USE_SSL = False
316316
EMAIL_USE_TLS = False
317-
EMAIL_SUBJECT_PREFIX = '[Jumpserver] '
317+
EMAIL_SUBJECT_PREFIX = '[JMS] '
318318

319319
REST_FRAMEWORK = {
320320
# Use Django's standard `django.contrib.auth` permissions,

0 commit comments

Comments
 (0)