Attachment 10332 Details for Bug 50848

[patch] missing set_deletion_grace()

bug_50848_missing_deletion_grace.patch (text/plain), 1.05 KB, created by Daniel Tröder on 2020-03-27 07:01 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Tröder

Created: 2020-03-27 07:01 CET

Size: 1.05 KB

patch

obsolete

>diff --git ucs-school-import/modules/ucsschool/importer/mass_import/sisopi_user_import.py ucs-school-import/modules/ucsschool/importer/mass_import/sisopi_user_import.py
>index 148a69d20..ee05e5627 100644
>--- ucs-school-import/modules/ucsschool/importer/mass_import/sisopi_user_import.py
>+++ ucs-school-import/modules/ucsschool/importer/mass_import/sisopi_user_import.py
>@@ -172,6 +172,7 @@ class SingleSourcePartialUserImport(UserImport):
> 		:return: whether the deletion worked
> 		:rtype: bool
> 		"""
>+		deletion_grace = max(0, int(self.config.get('deletion_grace_period', {}).get('deletion', 0)))
> 		modified = False
> 
> 		self.logger.info('Removing %r from school %r...', user, self.config['school'])
>@@ -197,6 +198,7 @@ class SingleSourcePartialUserImport(UserImport):
> 			imported_user.school_classes = {}
> 			user = self.school_move(imported_user, user)
> 			user.update(imported_user)  # user is freshly fetched from LDAP, readd import data
>+			modified |= self.set_deletion_grace(user, deletion_grace)
> 			modified |= self.deactivate_user_now(user)
> 
> 		if self.dry_run:

Actions: View | Diff

Attachments on bug 50848: 10332