From ef8940acf6883fef2db4e34444eb69876d48f878 Mon Sep 17 00:00:00 2001 From: Jason Moore Date: Mon, 21 Oct 2024 10:32:38 +0800 Subject: [PATCH] Fix sync script for staff numbers clearing legitimate numbers --- .../management/commands/sync_ad_users.py | 4 +-- .../migrations/0039_auto_20241021_1023.py | 26 +++++++++++++++++++ ledger/accounts/models.py | 4 +++ 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 ledger/accounts/migrations/0039_auto_20241021_1023.py diff --git a/ledger/accounts/management/commands/sync_ad_users.py b/ledger/accounts/management/commands/sync_ad_users.py index d0468cfee..d2f17d054 100755 --- a/ledger/accounts/management/commands/sync_ad_users.py +++ b/ledger/accounts/management/commands/sync_ad_users.py @@ -66,8 +66,8 @@ def handle(self, *args, **options): u.first_name = first_name u.last_name = last_name u.is_staff = True - u.phone_number = phone - u.mobile_number = mobile + u.staff_phone_number = phone + u.staff_mobile_number = mobile u.position_title = position_title u.manager_name = manager_name u.manager_email = manager_email diff --git a/ledger/accounts/migrations/0039_auto_20241021_1023.py b/ledger/accounts/migrations/0039_auto_20241021_1023.py new file mode 100644 index 000000000..474babc81 --- /dev/null +++ b/ledger/accounts/migrations/0039_auto_20241021_1023.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2024-10-21 02:23 +from __future__ import unicode_literals + +import django.core.files.storage +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('accounts', '0038_auto_20240716_1530'), + ] + + operations = [ + migrations.AddField( + model_name='emailuser', + name='staff_mobile_number', + field=models.CharField(blank=True, max_length=50, null=True, verbose_name='staff mobile number'), + ), + migrations.AddField( + model_name='emailuser', + name='staff_phone_number', + field=models.CharField(blank=True, max_length=50, null=True, verbose_name='staff phone number'), + ), + ] diff --git a/ledger/accounts/models.py b/ledger/accounts/models.py index 2a321a580..c785baaff 100755 --- a/ledger/accounts/models.py +++ b/ledger/accounts/models.py @@ -321,6 +321,10 @@ class EmailUser(AbstractBaseUser, PermissionsMixin): verbose_name="position title", help_text='Automatically synced from AD, please contact service desk to update.') mobile_number = models.CharField(max_length=50, null=True, blank=True, verbose_name="mobile number", help_text='') + staff_phone_number = models.CharField(max_length=50, null=True, blank=True, + verbose_name="staff phone number", help_text='') + staff_mobile_number = models.CharField(max_length=50, null=True, blank=True, + verbose_name="staff mobile number", help_text='') fax_number = models.CharField(max_length=50, null=True, blank=True, verbose_name="fax number", help_text='') organisation = models.CharField(max_length=300, null=True, blank=True,