From b1aecb6ff5199424005498c1e3fe27efca2152a4 Mon Sep 17 00:00:00 2001
From: root <root@arachne>
Date: Fri, 7 Oct 2016 21:30:05 +0200
Subject: [PATCH] Add rezo_rez old uid

---
 re2o/settings.py                           |  2 +-
 users/migrations/0038_user_rezo_rez_uid.py | 19 +++++++++++++++++++
 users/models.py                            |  5 +++--
 users/templates/users/aff_users.html       |  2 ++
 4 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 users/migrations/0038_user_rezo_rez_uid.py

diff --git a/re2o/settings.py b/re2o/settings.py
index de49c713..58204747 100644
--- a/re2o/settings.py
+++ b/re2o/settings.py
@@ -12,7 +12,7 @@ https://docs.djangoproject.com/en/1.8/ref/settings/
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
-from .settings_local import SECRET_KEY, DATABASES, DEBUG, ALLOWED_HOSTS, ASSO_NAME, ASSO_ADDRESS_LINE1, ASSO_ADDRESS_LINE2, ASSO_SIRET, ASSO_EMAIL, ASSO_PHONE, LOGO_PATH, services_urls, REQ_EXPIRE_HRS, REQ_EXPIRE_STR, EMAIL_FROM, SITE_NAME, LDAP
+from .settings_local import SECRET_KEY, DATABASES, DEBUG, ALLOWED_HOSTS, ASSO_NAME, ASSO_ADDRESS_LINE1, ASSO_ADDRESS_LINE2, ASSO_SIRET, ASSO_EMAIL, ASSO_PHONE, LOGO_PATH, services_urls, REQ_EXPIRE_HRS, REQ_EXPIRE_STR, EMAIL_FROM, SITE_NAME, LDAP, UID_RANGES
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
diff --git a/users/migrations/0038_user_rezo_rez_uid.py b/users/migrations/0038_user_rezo_rez_uid.py
new file mode 100644
index 00000000..6665aae6
--- /dev/null
+++ b/users/migrations/0038_user_rezo_rez_uid.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0037_ldapuser_login_shell'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='rezo_rez_uid',
+            field=models.IntegerField(null=True, blank=True, unique=True),
+        ),
+    ]
diff --git a/users/models.py b/users/models.py
index 63ef614b..e68ebfc2 100644
--- a/users/models.py
+++ b/users/models.py
@@ -116,6 +116,7 @@ class User(AbstractBaseUser):
     state = models.IntegerField(choices=STATES, default=STATE_ACTIVE)
     registered = models.DateTimeField(auto_now_add=True)
     uid_number = models.IntegerField(default=auto_uid, unique=True)
+    rezo_rez_uid =  models.IntegerField(unique=True, blank=True, null=True)
 
     USERNAME_FIELD = 'pseudo'
     REQUIRED_FIELDS = ['name', 'surname', 'email']
@@ -235,9 +236,9 @@ class User(AbstractBaseUser):
     def ldap_sync(self, base=True, access_refresh=True, mac_refresh=True):
         self.refresh_from_db()
         try:
-            user_ldap = LdapUser.objects.get(uidNumber=self.id)
+            user_ldap = LdapUser.objects.get(uidNumber=self.uid_number)
         except LdapUser.DoesNotExist:
-            user_ldap = LdapUser(uidNumber=self.id)
+            user_ldap = LdapUser(uidNumber=self.uid_number)
         if base:
             user_ldap.name = self.pseudo
             user_ldap.sn = self.pseudo
diff --git a/users/templates/users/aff_users.html b/users/templates/users/aff_users.html
index c86efaf5..e113be6d 100644
--- a/users/templates/users/aff_users.html
+++ b/users/templates/users/aff_users.html
@@ -19,6 +19,7 @@
                 <th>Prénom</th>
                 <th>Nom</th>
                 <th>Pseudo</th>
+                <th>Uid</th>
                 <th>Fin de cotisation le</th>
                 <th>Connexion</th>
                 <th>Profil</th>
@@ -29,6 +30,7 @@
             <td>{{ user.name }}</td>
             <td>{{ user.surname }}</td>
             <td>{{ user.pseudo }}</td>
+            <td>{{ user.uid_number }}</td>
             <td>{% if user.is_adherent %}{{ user.end_adhesion }}{% else %}Non adhérent{% endif %}</td>
             <td>{% if user.has_access == True %}
                 <font color="green">Active</font>