From 098440eb5009c0a19a9af37779ede61581648c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Kervella?= Date: Thu, 12 Jul 2018 16:19:23 +0000 Subject: [PATCH] Use m2m_changed signal to resync LDAP after a user's group has changed --- users/models.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/users/models.py b/users/models.py index 0284985c..6c6837d6 100644 --- a/users/models.py +++ b/users/models.py @@ -52,7 +52,7 @@ import datetime from django.db import models from django.db.models import Q from django import forms -from django.db.models.signals import post_save, post_delete +from django.db.models.signals import post_save, post_delete, m2m_changed from django.dispatch import receiver from django.utils.functional import cached_property from django.template import Context, loader @@ -538,7 +538,10 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser, machine__user=self ).values_list('mac_address', flat=True).distinct()] if group_refresh: - for group in self.groups.all(): + # Need to refresh all groups because we don't know which groups + # were updated during edition of groups and the user may no longer + # be part of the updated group (case of group removal) + for group in Group.objects.all(): if hasattr(group, 'listright'): group.listright.ldap_sync() user_ldap.save() @@ -1018,6 +1021,16 @@ def user_post_save(**kwargs): regen('mailing') +@receiver(m2m_changed, sender=User.groups.through) +def user_group_relation_changed(**kwargs): + action = kwargs['action'] + if action in ('post_add', 'post_remove', 'post_clear'): + user = kwargs['instance'] + user.ldap_sync(base=False, + access_refresh=False, + mac_refresh=False, + group_refresh=True) + @receiver(post_delete, sender=Adherent) @receiver(post_delete, sender=Club) @receiver(post_delete, sender=User)