From a3bf7c7349740262f65fff632e1687e6e6f2f6bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Mon, 20 Apr 2015 21:26:13 +0200
Subject: [PATCH] =?UTF-8?q?Les=20clubs=20n'ont=20pas=20forc=C3=A9ment=20de?=
 =?UTF-8?q?=20login/mail.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 * Et il leur faut un update_connexion, même s'il ne fait rien
---
 gestion/gest_crans.py | 21 ++++++++++-----------
 gestion/ldap_crans.py |  4 ++++
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/gestion/gest_crans.py b/gestion/gest_crans.py
index 291b7151..1d570109 100755
--- a/gestion/gest_crans.py
+++ b/gestion/gest_crans.py
@@ -2380,7 +2380,7 @@ def select(clas, quoi, mde=''):
     si m = ro ouvre l'objet en mode read-only
     """
 
-    s= ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '']
+    s= ['', '', '', '', '', '', '', '', '', '', '', '', '', '']
     def unicodize(a):
         try:
             return unicode(a, 'utf-8')
@@ -2402,14 +2402,13 @@ def select(clas, quoi, mde=''):
         arg += u'"Nom :"       2 37 "%s" 2 46 20 30 ' % s[6]
         arg += u'"Local :"   3 37 "%s" 3 46 20 00 ' % s[7]
         arg += u'"cid :"       4 37 "%s" 4 46 20 5 ' % s[8]
-        arg += u'"Login :"      5 37 "%s" 5 46 20 00 ' % s[9]
         arg += u'"Filtres facture" 6 40 "" 0 0 0 0 '
-        arg += u'"fid :" 7 37 "%s" 7 46 20 5 ' % s[10]
+        arg += u'"fid :" 7 37 "%s" 7 46 20 5 ' % s[9]
         arg += u'"Filtres machine" 1 75 "" 0 0 0 0 '
-        arg += u'"Nom :" 2 68 "%s" 2 77 20 50 ' % s[11]
-        arg += u'"Mac :" 3 68 "%s" 3 77 20 17 ' % s[12]
-        arg += u'"IP :"  4 68 "%s" 4 77 20 40 ' % s[13]
-        arg += u'"mid :" 5 68 "%s" 5 77 20 5 ' % s[14]
+        arg += u'"Nom :" 2 68 "%s" 2 77 20 50 ' % s[10]
+        arg += u'"Mac :" 3 68 "%s" 3 77 20 17 ' % s[11]
+        arg += u'"IP :"  4 68 "%s" 4 77 20 40 ' % s[12]
+        arg += u'"mid :" 5 68 "%s" 5 77 20 5 ' % s[13]
         arg += u'"Remarque : les champs vides sont ignorés." 8 1 "" 0 0 0 0'
 
         annul, result = dialog(arg)
@@ -2434,9 +2433,9 @@ def select(clas, quoi, mde=''):
 
         ### Contruction de la chaîne de recherche
         filtre_adher = u'nom=%s&prenom=%s&tel=%s&chbre=%s&aid=%s&mail=%s&' % tuple(s[:6])
-        filtre_clubs = u'nom=%s&chbre=%s&cid=%s&uid=%s&' % tuple(s[6:10])
-        filtre_facture = u'fid=%s&' % s[10]
-        filtre_machine = u'host=%s&macAddress=%s&ipHostNumber=%s&mid=%s&' % tuple(s[11:])
+        filtre_clubs = u'nom=%s&chbre=%s&cid=%s&' % tuple(s[6:9])
+        filtre_facture = u'fid=%s&' % s[9]
+        filtre_machine = u'host=%s&macAddress=%s&ipHostNumber=%s&mid=%s&' % tuple(s[10:])
 
         filtre = u''
         if filtre_adher.count('=*&') != 6:
@@ -2449,7 +2448,7 @@ def select(clas, quoi, mde=''):
         if filtre_facture.count('=*&') != 1:
             if filtre: filtre += '&'
             filtre += filtre_facture[:-1]
-        if filtre_clubs.count('=*&') != 4:
+        if filtre_clubs.count('=*&') != 3:
             if filtre: filtre += '&'
             filtre += filtre_clubs[:-1]
         if filtre == '':
diff --git a/gestion/ldap_crans.py b/gestion/ldap_crans.py
index 52f3e0ce..413e3fa6 100755
--- a/gestion/ldap_crans.py
+++ b/gestion/ldap_crans.py
@@ -2937,6 +2937,10 @@ class Club(BaseProprietaire):
         """ Retourne l'adresse mail du responsable """
         return self.responsable().email()
 
+    def update_connexion(self):
+        """Dummy"""
+        pass
+
 class Machine(BaseClasseCrans):
     """ Classe de définition d'une machine """
     idn = 'mid'