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

Merge remote-tracking branch 'github/dev' into dev

pull/1185/head
ibuler 2018-04-10 21:02:36 +08:00
parent ed71e7d2d9 b8b78ffeb2
commit 3193c5549d
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apps/users/signals_handler.py
View File

@ -2,19 +2,29 @@
# #
from django.dispatch import receiver from django.dispatch import receiver
from django.db.models.signals import post_save # from django.db.models.signals import post_save
from common.utils import get_logger from common.utils import get_logger
from .models import User from .signals import post_user_create
# from .models import User
logger = get_logger(__file__) logger = get_logger(__file__)
@receiver(post_save, sender=User) # @receiver(post_save, sender=User)
def on_user_created(sender, instance=None, created=False, **kwargs): # def on_user_created(sender, instance=None, created=False, **kwargs):
if created: # if created:
logger.debug("Receive user `{}` create signal".format(instance.name)) # logger.debug("Receive user `{}` create signal".format(instance.name))
from .utils import send_user_created_mail # from .utils import send_user_created_mail
logger.info(" - Sending welcome mail ...".format(instance.name)) # logger.info(" - Sending welcome mail ...".format(instance.name))
if instance.email: # if instance.email:
send_user_created_mail(instance) # send_user_created_mail(instance)
@receiver(post_user_create)
def on_user_create(sender, user=None, **kwargs):
logger.debug("Receive user `{}` create signal".format(user.name))
from .utils import send_user_created_mail
logger.info(" - Sending welcome mail ...".format(user.name))
if user.email:
send_user_created_mail(user)

1
apps/users/views/user.py
View File

@ -79,6 +79,7 @@ class UserCreateView(AdminUserRequiredMixin, SuccessMessageMixin, CreateView):
user = form.save(commit=False) user = form.save(commit=False)
user.created_by = self.request.user.username or 'System' user.created_by = self.request.user.username or 'System'
user.save() user.save()
post_user_create.send(self.__class__, user=user)
return super().form_valid(form) return super().form_valid(form)