Fabs il y a 10 ans
Parent
commit
3d3bfb17a9
3 fichiers modifiés avec 19 ajouts et 12 suppressions
  1. 4 3
      coin/members/admin.py
  2. 4 4
      coin/members/models.py
  3. 11 5
      coin/utils.py

+ 4 - 3
coin/members/admin.py

@@ -47,7 +47,7 @@ class MemberAdmin(UserAdmin):
         ('Adhérent', {'fields': (
             ('status', 'resign_date'),
             'type',
-                ('first_name', 'last_name', 'organization_name'))}),
+            ('first_name', 'last_name', 'organization_name'))}),
         ('Coordonnées', {'fields': (
             'email',
             ('home_phone_number', 'mobile_phone_number'),
@@ -126,7 +126,7 @@ class MemberAdmin(UserAdmin):
             member = get_object_or_404(Member, pk=id)
             member.send_welcome_email()
             messages.success(request,
-                'Le courriel de bienvenue a été envoyé à %s' % member.email)
+                             'Le courriel de bienvenue a été envoyé à %s' % member.email)
         else:
             messages.error(
                 request, 'Vous n\'avez pas l\'autorisation d\'envoyer des '
@@ -142,9 +142,10 @@ class MemberAdmin(UserAdmin):
         for member in queryset.all():
             self.send_welcome_email(request, member.id)
         messages.success(request,
-            'Le courriel de bienvenue a été envoyé à %d membre(s).' % queryset.count())
+                         'Le courriel de bienvenue a été envoyé à %d membre(s).' % queryset.count())
     bulk_send_welcome_email.short_description = "Envoyer le courriel de bienvenue"
 
+
 class MembershipFeeAdmin(admin.ModelAdmin):
     list_display = ('member', 'end_date', 'amount', 'payment_method',
                     'payment_date')

+ 4 - 4
coin/members/models.py

@@ -131,7 +131,6 @@ class Member(CoinLdapSyncMixin, AbstractUser):
             Q(subscription_date__gt=date) |
             Q(resign_date__lt=date))
 
-
     def sync_to_ldap(self, creation, update_fields, *args, **kwargs):
         """
         Update LDAP data when a member is saved
@@ -214,7 +213,6 @@ class Member(CoinLdapSyncMixin, AbstractUser):
                                    body_template='members/emails/welcome_email.html',
                                    context={'member': self})
 
-
     class Meta:
         verbose_name = 'membre'
 
@@ -231,6 +229,7 @@ Member._meta.get_field('last_name').null = False
 def count_active_members():
     return Member.objects.filter(status='member').count()
 
+
 def get_automatic_username(first_name, last_name):
     """
     Calcul le username automatiquement en fonction
@@ -261,7 +260,7 @@ def get_automatic_username(first_name, last_name):
     # Tant qu'un membre est trouvé, incrément un entier à la fin
     while member:
         if len(base_username) >= 30:
-            username = base_username[30-len(str(incr)):]
+            username = base_username[30 - len(str(incr)):]
         else:
             username = base_username
         username = username + str(incr)
@@ -270,6 +269,7 @@ def get_automatic_username(first_name, last_name):
 
     return username
 
+
 class CryptoKey(models.Model):
 
     KEY_TYPE_CHOICES = (('RSA', 'RSA'), ('GPG', 'GPG'))
@@ -379,7 +379,7 @@ def define_username(sender, instance, **kwargs):
     le calcul automatiquement en fonction du nom et du prénom
     """
     if not instance.username and not instance.pk:
-        instance.username = get_automatic_username(instance.first_name, 
+        instance.username = get_automatic_username(instance.first_name,
                                                    instance.last_name)
 
 

+ 11 - 5
coin/utils.py

@@ -19,6 +19,7 @@ from django.contrib.sites.models import Site
 # Stockage des fichiers privés (comme les factures par exemple)
 private_files_storage = FileSystemStorage(location=settings.PRIVATE_FILES_ROOT)
 
+
 def str_or_none(obj):
     return str(obj) if obj else None
 
@@ -38,10 +39,10 @@ def send_templated_email(to, subject_template, body_template, context={}, attach
     """
     Send a multialternative email based on html and optional txt template.
     """
-    
+
     # Ensure arrays when needed
     if not isinstance(to, list):
-        to = [to] 
+        to = [to]
     if not isinstance(attachements, list):
         attachements = [attachements]
 
@@ -67,18 +68,19 @@ def send_templated_email(to, subject_template, body_template, context={}, attach
         text_content = template_txt.render_to_string(Context(context))
     except TemplateDoesNotExist:
         text_content = html2text.html2text(html_content)
-    
+
     # make multipart email default : text, alternative : html
     msg = EmailMultiAlternatives(subject=subject, body=text_content, to=to)
     msg.attach_alternative(html_content, "text/html")
-    
+
     # Set attachements
     for attachement in attachements:
         msg.attach_file(attachement)
 
-    #Send email
+    # Send email
     msg.send()
 
+
 def delete_selected(modeladmin, request, queryset):
     """Overrides QuerySet's delete() function to remove objects one by one 
     so, that they are deleted in the LDAP (Redmine issue #195)."""
@@ -88,12 +90,16 @@ def delete_selected(modeladmin, request, queryset):
 delete_selected.short_description = "Supprimer tous les objets sélectionnés."
 
 # Time-related functions
+
+
 def in_one_year():
     return date.today() + timedelta(365)
 
+
 def start_of_month():
     return date(date.today().year, date.today().month, 1)
 
+
 def end_of_month():
     return date(date.today().year, date.today().month + 1, 1) - timedelta(days=1)