From 148c31ebec27ba7eb477638a7b56d8006405dc7d Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 8 Jan 2019 15:24:49 +0100 Subject: [PATCH 2/4] data_transfer: move update_model (#29545) --- src/authentic2/data_transfer.py | 8 ++++++-- src/authentic2/utils.py | 5 ----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/authentic2/data_transfer.py b/src/authentic2/data_transfer.py index 090c7b33..25a815c0 100644 --- a/src/authentic2/data_transfer.py +++ b/src/authentic2/data_transfer.py @@ -2,9 +2,13 @@ from django.contrib.contenttypes.models import ContentType from django_rbac.models import Operation from django_rbac.utils import ( - get_ou_model, get_role_model, get_role_parenting_model, get_permission_model) + get_ou_model, get_role_model, get_role_parenting_model, get_permission_model) from authentic2.a2_rbac.models import RoleAttribute -from authentic2.utils import update_model + + +def update_model(obj, d): + for attr, value in d.items(): + setattr(obj, attr, value) def export_site(): diff --git a/src/authentic2/utils.py b/src/authentic2/utils.py index 1ff7e89d..f6b6ffe4 100644 --- a/src/authentic2/utils.py +++ b/src/authentic2/utils.py @@ -1047,11 +1047,6 @@ def send_email_change_email(user, email, request=None, context=None, template_na legacy_body_templates=legacy_body_templates) -def update_model(obj, d): - for attr, value in d.items(): - setattr(obj, attr, value) - - def get_user_flag(user, name, default=None): '''Get a boolean flag settable at user, by a hook, globally or ou wide''' from . import hooks -- 2.20.1