rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-22 03:13:12 +00:00
Code Issues Releases Wiki Activity

Merge branch '343-ldap_sync-and-ldap_rebuild-do-not-regenerate-service-users-2' into 'dev'

Browse source 
fix: Resolve "ldap_sync and ldap_rebuild do not regenerate service-users"

See merge request re2o/re2o!618
This commit is contained in:
Jean-Romain Garnier 2021-09-05 12:58:00 +00:00
commit ca2e999089
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ldap_sync/management/commands/ldap_rebuild.py
View file

@ -21,9 +21,8 @@ from base64 import decodebytes
from django.conf import settings from django.conf import settings
from django.core.management.base import BaseCommand, CommandError from django.core.management.base import BaseCommand, CommandError
from ldap_sync.models import (synchronise_serviceuser, synchronise_user, from users.models import User, ListRight, ServiceUser
synchronise_usergroup) from ldap_sync.models import synchronise_user, synchronise_serviceuser, synchronise_usergroup
from users.models import ListRight, User
def split_lines(lines): def split_lines(lines):
@ -95,6 +94,8 @@ def sync_ldap():
synchronise_user(sender=User, instance=u) synchronise_user(sender=User, instance=u)
for lr in ListRight.objects.all(): for lr in ListRight.objects.all():
synchronise_usergroup(sender=ListRight, instance=lr) synchronise_usergroup(sender=ListRight, instance=lr)
for service_user in ServiceUser.objects.all():
synchronise_serviceuser(sender=ServiceUser, instance=service_user)
class Command(BaseCommand): class Command(BaseCommand):

8
ldap_sync/management/commands/ldap_sync.py
View file

@ -19,8 +19,8 @@
# #
from django.core.management.base import BaseCommand, CommandError from django.core.management.base import BaseCommand, CommandError
from ldap_sync.models import synchronise_user from users.models import User, ListRight, ServiceUser
from users.models import User from ldap_sync.models import synchronise_user, synchronise_serviceuser, synchronise_usergroup
class Command(BaseCommand): class Command(BaseCommand):
@ -40,3 +40,7 @@ class Command(BaseCommand):
def handle(self, *args, **options): def handle(self, *args, **options):
for user in User.objects.all(): for user in User.objects.all():
synchronise_user(sender=User, instance=user) synchronise_user(sender=User, instance=user)
for lr in ListRight.objects.all():
synchronise_usergroup(sender=ListRight, instance=lr)
for service_user in ServiceUser.objects.all():
synchronise_serviceuser(sender=ServiceUser, instance=service_user)