github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6294 from jumpserver/dev 

v2.11.0 rc5
pull/6298/head v2.11.0
Jiangjie.Bai 2021-06-17 12:23:20 +08:00 committed by GitHub
parent 64f772e747 b5120e72c8
commit 502657bad4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/applications/serializers/application.py
View File

@ -105,4 +105,4 @@ class ApplicationUserSerializer(SystemUserSerializer):
class ApplicationUserWithAuthInfoSerializer(ApplicationUserSerializer): class ApplicationUserWithAuthInfoSerializer(ApplicationUserSerializer):
class Meta(ApplicationUserSerializer.Meta): class Meta(ApplicationUserSerializer.Meta):
fields = ApplicationUserSerializer.Meta.fields + ['password'] fields = ApplicationUserSerializer.Meta.fields + ['password', 'token']

2
apps/notifications/backends/email.py
View File

@ -11,4 +11,4 @@ class Email(BackendBase):
def send_msg(self, users, subject, message): def send_msg(self, users, subject, message):
from_email = settings.EMAIL_FROM or settings.EMAIL_HOST_USER from_email = settings.EMAIL_FROM or settings.EMAIL_HOST_USER
accounts, __, __ = self.get_accounts(users) accounts, __, __ = self.get_accounts(users)
send_mail(subject, message, from_email, accounts) send_mail(subject, message, from_email, accounts, html_message=message)