Browse Source

Admin integration of AbstractBaseUser
Migrations in next commit

Fabs 10 years ago
parent
commit
0ce93a1fb6
23 changed files with 100 additions and 1571 deletions
  1. 45 15
      coin/members/admin.py
  2. 38 0
      coin/members/forms.py
  3. 0 77
      coin/members/migrations/0001_initial.py
  4. 0 93
      coin/members/migrations/0002_auto__del_field_member_gender__add_field_member_ldap_cn__add_field_mem.py
  5. 0 53
      coin/members/migrations/0003_auto__chg_field_member_type.py
  6. 0 66
      coin/members/migrations/0004_auto__add_membershipfee.py
  7. 0 60
      coin/members/migrations/0005_entrydate_not_null.py
  8. 0 60
      coin/members/migrations/0006_auto__chg_field_member_entry_date.py
  9. 0 79
      coin/members/migrations/0007_auto__del_field_membershipfee_date__add_field_membershipfee_start_date.py
  10. 0 104
      coin/members/migrations/0008_auto__add_field_member_user.py
  11. 0 108
      coin/members/migrations/0009_auto__chg_field_member_user__add_unique_member_user.py
  12. 0 117
      coin/members/migrations/0010_auto__del_field_member_user__add_field_member_password__add_field_memb.py
  13. 0 116
      coin/members/migrations/0011_auto__add_field_member_is_superuser.py
  14. 0 104
      coin/members/migrations/0012_auto__del_field_member_ldap_cn__add_field_member_login.py
  15. 0 102
      coin/members/migrations/0013_auto__add_field_member_is_active__add_field_member_is_admin.py
  16. 0 100
      coin/members/migrations/0014_auto__del_field_member_is_active__del_field_member_is_admin.py
  17. 0 93
      coin/members/migrations/0015_auto__add_field_member_is_active.py
  18. 0 94
      coin/members/migrations/0016_auto__add_field_member_is_admin.py
  19. 0 102
      coin/members/migrations/0017_auto__del_field_member_is_admin__add_field_member_is_staff.py
  20. 4 11
      coin/members/models.py
  21. 3 16
      coin/members/views.py
  22. 1 1
      coin/settings.py
  23. 9 0
      coin/templates/admin/auth/user/add_form.html

+ 45 - 15
coin/members/admin.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.models import Group
 from coin.members.models import Member, CryptoKey, LdapUser, MembershipFee
-from django import forms
 from coin.members.membershipfee_filter import MembershipFeeFilter
+from coin.members.forms import MemberChangeForm, MemberCreationForm
 import autocomplete_light
 
 
@@ -17,24 +19,51 @@ class MembershipFeeInline(admin.TabularInline):
     fields = ('start_date', 'end_date', 'amount')
 
 
-class MemberAdmin(admin.ModelAdmin):
-    list_display = ('id', 'status', 'first_name', 'last_name',
+class MemberAdmin(UserAdmin):
+    list_display = ('id', 'status', 'login', 'first_name', 'last_name',
                     'organization_name', 'email', 'end_date_of_membership')
-    list_display_links = ('id', 'first_name', 'last_name')
+    list_display_links = ('id', 'login', 'first_name', 'last_name')
     list_filter = ('status', MembershipFeeFilter)
-    search_fields = ['first_name', 'last_name', 'email']
+    search_fields = ['login', 'first_name', 'last_name', 'email']
+    ordering = ('last_name',)
     actions = ['set_as_member', 'set_as_non_member']
 
-    fields = (
-                'status',
-                'type',
-                ('first_name', 'last_name', 'organization_name'),
-                ('email', 'home_phone_number', 'mobile_phone_number'),
-                'address',
-                ('postal_code', 'city', 'country'),
-                ('entry_date', 'resign_date'),
-                'login'
-             )
+    form = MemberChangeForm
+    add_form = MemberCreationForm
+
+    fieldsets = (
+                ('Adhérent', {'fields':(
+                    'status',
+                    'type',   
+                    ('first_name', 'last_name', 'organization_name'),
+                    ('entry_date', 'resign_date'))}),
+                ('Coordonnées', {'fields':(
+                    'email', 
+                    ('home_phone_number', 'mobile_phone_number'),
+                    'address',
+                    ('postal_code', 'city', 'country'))}),
+                ('Authentification', {'fields':(
+                    ('login', 'password'),)}),
+                ('Permissions', {'fields':(
+                    ('is_staff', 'is_superuser'))})
+                )
+
+    add_fieldsets = (
+                ('Adhérent', {'fields':(
+                    'status',
+                    'type',   
+                    ('first_name', 'last_name', 'organization_name'),
+                    ('entry_date', 'resign_date'))}),
+                ('Coordonnées', {'fields':(
+                    'email', 
+                    ('home_phone_number', 'mobile_phone_number'),
+                    'address',
+                    ('postal_code', 'city', 'country'))}),
+                ('Authentification', {'fields':(
+                    ('login','password'))}),
+                ('Permissions', {'fields':(
+                    ('is_staff', 'is_superuser'))})
+                )
 
     radio_fields = {"type": admin.HORIZONTAL}
 
@@ -69,4 +98,5 @@ class MembershipFeeAdmin(admin.ModelAdmin):
 
 admin.site.register(Member, MemberAdmin)
 admin.site.register(MembershipFee, MembershipFeeAdmin)
+admin.site.unregister(Group)
 # admin.site.register(LdapUser, LdapUserAdmin)

+ 38 - 0
coin/members/forms.py

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+from django import forms
+from django.contrib.auth.forms import ReadOnlyPasswordHashField
+
+from coin.members.models import Member
+
+
+class MemberCreationForm(forms.ModelForm):
+    password = forms.CharField(label='Password', widget=forms.PasswordInput)
+
+    class Meta:
+        model = Member
+        fields = ('email', 'first_name', 'last_name')
+
+    def save(self, commit=True):
+        """
+        Save member, then set his password
+        """
+        member = super(MemberCreationForm, self).save(commit=False)
+        member.set_password(self.cleaned_data["password"])
+        if commit:
+            member.member()
+            member.set_ldap_password(self.cleaned_data["password"])
+        return member
+
+
+class MemberChangeForm(forms.ModelForm):
+    password = ReadOnlyPasswordHashField()
+
+    class Meta:
+        model = Member
+        fields = ('password', 'first_name', 'last_name', 'is_active', 'is_staff')
+
+    def clean_password(self):
+        # Regardless of what the user provides, return the initial value.
+        # This is done here, rather than on the field, because the
+        # field does not have access to the initial value
+        return self.initial["password"]

+ 0 - 77
coin/members/migrations/0001_initial.py

@@ -1,77 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'Member'
-        db.create_table(u'members_member', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('type', self.gf('django.db.models.fields.CharField')(default='individual', max_length=11)),
-            ('gender', self.gf('django.db.models.fields.CharField')(max_length=6)),
-            ('first_name', self.gf('django.db.models.fields.CharField')(max_length=200)),
-            ('last_name', self.gf('django.db.models.fields.CharField')(max_length=200)),
-            ('organization_name', self.gf('django.db.models.fields.CharField')(max_length=200, blank=True)),
-            ('email', self.gf('django.db.models.fields.EmailField')(max_length=254)),
-            ('home_phone_number', self.gf('django.db.models.fields.CharField')(max_length=25, blank=True)),
-            ('mobile_phone_number', self.gf('django.db.models.fields.CharField')(max_length=25, blank=True)),
-            ('address', self.gf('django.db.models.fields.CharField')(max_length=200)),
-            ('postal_code', self.gf('django.db.models.fields.CharField')(max_length=15)),
-            ('city', self.gf('django.db.models.fields.CharField')(max_length=200)),
-            ('country', self.gf('django.db.models.fields.CharField')(max_length=200)),
-        ))
-        db.send_create_signal(u'members', ['Member'])
-
-        # Adding model 'CryptoKey'
-        db.create_table(u'members_cryptokey', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('type', self.gf('django.db.models.fields.CharField')(max_length=3)),
-            ('key', self.gf('django.db.models.fields.TextField')()),
-            ('member', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['members.Member'])),
-        ))
-        db.send_create_signal(u'members', ['CryptoKey'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'Member'
-        db.delete_table(u'members_member')
-
-        # Deleting model 'CryptoKey'
-        db.delete_table(u'members_cryptokey')
-
-
-    models = {
-        u'members.cryptokey': {
-            'Meta': {'object_name': 'CryptoKey'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '3'})
-        },
-        u'members.ldapuser': {
-            'Meta': {'object_name': 'LdapUser', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.member': {
-            'Meta': {'object_name': 'Member'},
-            'address': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'city': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'country': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'gender': ('django.db.models.fields.CharField', [], {'max_length': '6'}),
-            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'individual'", 'max_length': '11'})
-        }
-    }
-
-    complete_apps = ['members']

+ 0 - 93
coin/members/migrations/0002_auto__del_field_member_gender__add_field_member_ldap_cn__add_field_mem.py

@@ -1,93 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Deleting field 'Member.gender'
-        db.delete_column(u'members_member', 'gender')
-
-        # Adding field 'Member.ldap_cn'
-        db.add_column(u'members_member', 'ldap_cn',
-                      self.gf('django.db.models.fields.CharField')(default='', max_length=200),
-                      keep_default=False)
-
-        # Adding field 'Member.status'
-        db.add_column(u'members_member', 'status',
-                      self.gf('django.db.models.fields.CharField')(default='non_adherent', max_length=50),
-                      keep_default=False)
-
-        # Adding field 'Member.entry_date'
-        db.add_column(u'members_member', 'entry_date',
-                      self.gf('django.db.models.fields.DateField')(null=True),
-                      keep_default=False)
-
-        # Adding field 'Member.resign_date'
-        db.add_column(u'members_member', 'resign_date',
-                      self.gf('django.db.models.fields.DateField')(null=True),
-                      keep_default=False)
-
-
-        # Changing field 'Member.address'
-        db.alter_column(u'members_member', 'address', self.gf('django.db.models.fields.TextField')())
-
-    def backwards(self, orm):
-        # Adding field 'Member.gender'
-        db.add_column(u'members_member', 'gender',
-                      self.gf('django.db.models.fields.CharField')(default='', max_length=6),
-                      keep_default=False)
-
-        # Deleting field 'Member.ldap_cn'
-        db.delete_column(u'members_member', 'ldap_cn')
-
-        # Deleting field 'Member.status'
-        db.delete_column(u'members_member', 'status')
-
-        # Deleting field 'Member.entry_date'
-        db.delete_column(u'members_member', 'entry_date')
-
-        # Deleting field 'Member.resign_date'
-        db.delete_column(u'members_member', 'resign_date')
-
-
-        # Changing field 'Member.address'
-        db.alter_column(u'members_member', 'address', self.gf('django.db.models.fields.CharField')(max_length=200))
-
-    models = {
-        u'members.cryptokey': {
-            'Meta': {'object_name': 'CryptoKey'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '3'})
-        },
-        u'members.ldapuser': {
-            'Meta': {'object_name': 'LdapUser', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.member': {
-            'Meta': {'object_name': 'Member'},
-            'address': ('django.db.models.fields.TextField', [], {}),
-            'city': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'country': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
-            'entry_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'ldap_cn': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '200'}),
-            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
-            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
-            'status': ('django.db.models.fields.CharField', [], {'default': "'non_adherent'", 'max_length': '50'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'individual'", 'max_length': '11'})
-        }
-    }
-
-    complete_apps = ['members']

+ 0 - 53
coin/members/migrations/0003_auto__chg_field_member_type.py

@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-
-        # Changing field 'Member.type'
-        db.alter_column(u'members_member', 'type', self.gf('django.db.models.fields.CharField')(max_length=20))
-
-    def backwards(self, orm):
-
-        # Changing field 'Member.type'
-        db.alter_column(u'members_member', 'type', self.gf('django.db.models.fields.CharField')(max_length=11))
-
-    models = {
-        u'members.cryptokey': {
-            'Meta': {'object_name': 'CryptoKey'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '3'})
-        },
-        u'members.ldapuser': {
-            'Meta': {'object_name': 'LdapUser', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.member': {
-            'Meta': {'object_name': 'Member'},
-            'address': ('django.db.models.fields.TextField', [], {}),
-            'city': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'country': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
-            'entry_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'ldap_cn': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
-            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'status': ('django.db.models.fields.CharField', [], {'default': "'non_adherent'", 'max_length': '50'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'personne_physique'", 'max_length': '20'})
-        }
-    }
-
-    complete_apps = ['members']

+ 0 - 66
coin/members/migrations/0004_auto__add_membershipfee.py

@@ -1,66 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'MembershipFee'
-        db.create_table(u'members_membershipfee', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('member', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['members.Member'])),
-            ('amount', self.gf('django.db.models.fields.IntegerField')()),
-            ('date', self.gf('django.db.models.fields.DateField')()),
-        ))
-        db.send_create_signal(u'members', ['MembershipFee'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'MembershipFee'
-        db.delete_table(u'members_membershipfee')
-
-
-    models = {
-        u'members.cryptokey': {
-            'Meta': {'object_name': 'CryptoKey'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '3'})
-        },
-        u'members.ldapuser': {
-            'Meta': {'object_name': 'LdapUser', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.member': {
-            'Meta': {'object_name': 'Member'},
-            'address': ('django.db.models.fields.TextField', [], {}),
-            'city': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'country': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
-            'entry_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'ldap_cn': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
-            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'status': ('django.db.models.fields.CharField', [], {'default': "'non_adherent'", 'max_length': '50'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'personne_physique'", 'max_length': '20'})
-        },
-        u'members.membershipfee': {
-            'Meta': {'object_name': 'MembershipFee'},
-            'amount': ('django.db.models.fields.IntegerField', [], {}),
-            'date': ('django.db.models.fields.DateField', [], {}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"})
-        }
-    }
-
-    complete_apps = ['members']

+ 0 - 60
coin/members/migrations/0005_entrydate_not_null.py

@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import DataMigration
-from django.db import models
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        from datetime import date
-        
-        for member in orm.Member.objects.all():
-            member.entry_date = '2011-07-04'
-            member.save()
-
-    def backwards(self, orm):
-        "Write your backwards methods here."
-
-    models = {
-        u'members.cryptokey': {
-            'Meta': {'object_name': 'CryptoKey'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '3'})
-        },
-        u'members.ldapuser': {
-            'Meta': {'object_name': 'LdapUser', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.member': {
-            'Meta': {'object_name': 'Member'},
-            'address': ('django.db.models.fields.TextField', [], {}),
-            'city': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'country': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
-            'entry_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'ldap_cn': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
-            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'status': ('django.db.models.fields.CharField', [], {'default': "'non_adherent'", 'max_length': '50'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'personne_physique'", 'max_length': '20'})
-        },
-        u'members.membershipfee': {
-            'Meta': {'object_name': 'MembershipFee'},
-            'amount': ('django.db.models.fields.IntegerField', [], {}),
-            'date': ('django.db.models.fields.DateField', [], {}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"})
-        }
-    }
-
-    complete_apps = ['members']
-    symmetrical = True

+ 0 - 60
coin/members/migrations/0006_auto__chg_field_member_entry_date.py

@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-
-        # Changing field 'Member.entry_date'
-        db.alter_column(u'members_member', 'entry_date', self.gf('django.db.models.fields.DateField')())
-
-    def backwards(self, orm):
-
-        # Changing field 'Member.entry_date'
-        db.alter_column(u'members_member', 'entry_date', self.gf('django.db.models.fields.DateField')(null=True))
-
-    models = {
-        u'members.cryptokey': {
-            'Meta': {'object_name': 'CryptoKey'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '3'})
-        },
-        u'members.ldapuser': {
-            'Meta': {'object_name': 'LdapUser', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.member': {
-            'Meta': {'object_name': 'Member'},
-            'address': ('django.db.models.fields.TextField', [], {}),
-            'city': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'country': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
-            'entry_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'ldap_cn': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
-            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'status': ('django.db.models.fields.CharField', [], {'default': "'non_adherent'", 'max_length': '50'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'personne_physique'", 'max_length': '20'})
-        },
-        u'members.membershipfee': {
-            'Meta': {'object_name': 'MembershipFee'},
-            'amount': ('django.db.models.fields.IntegerField', [], {}),
-            'date': ('django.db.models.fields.DateField', [], {}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"})
-        }
-    }
-
-    complete_apps = ['members']

+ 0 - 79
coin/members/migrations/0007_auto__del_field_membershipfee_date__add_field_membershipfee_start_date.py

@@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Deleting field 'MembershipFee.date'
-        db.delete_column(u'members_membershipfee', 'date')
-
-        # Adding field 'MembershipFee.start_date'
-        db.add_column(u'members_membershipfee', 'start_date',
-                      self.gf('django.db.models.fields.DateField')(default=datetime.date.today),
-                      keep_default=False)
-
-        # Adding field 'MembershipFee.end_date'
-        db.add_column(u'members_membershipfee', 'end_date',
-                      self.gf('django.db.models.fields.DateField')(default=datetime.datetime(2014, 11, 9, 0, 0)),
-                      keep_default=False)
-
-
-    def backwards(self, orm):
-        # Adding field 'MembershipFee.date'
-        db.add_column(u'members_membershipfee', 'date',
-                      self.gf('django.db.models.fields.DateField')(default='2011-07-04'),
-                      keep_default=False)
-
-        # Deleting field 'MembershipFee.start_date'
-        db.delete_column(u'members_membershipfee', 'start_date')
-
-        # Deleting field 'MembershipFee.end_date'
-        db.delete_column(u'members_membershipfee', 'end_date')
-
-
-    models = {
-        u'members.cryptokey': {
-            'Meta': {'object_name': 'CryptoKey'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '3'})
-        },
-        u'members.ldapuser': {
-            'Meta': {'object_name': 'LdapUser', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.member': {
-            'Meta': {'object_name': 'Member'},
-            'address': ('django.db.models.fields.TextField', [], {}),
-            'city': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'country': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
-            'entry_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'ldap_cn': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
-            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'status': ('django.db.models.fields.CharField', [], {'default': "'non_adherent'", 'max_length': '50'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'personne_physique'", 'max_length': '20'})
-        },
-        u'members.membershipfee': {
-            'Meta': {'object_name': 'MembershipFee'},
-            'amount': ('django.db.models.fields.IntegerField', [], {'default': "'20'"}),
-            'end_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2014, 11, 9, 0, 0)'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
-            'start_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'})
-        }
-    }
-
-    complete_apps = ['members']

+ 0 - 104
coin/members/migrations/0008_auto__add_field_member_user.py

@@ -1,104 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding field 'Member.user'
-        db.add_column(u'members_member', 'user',
-                      self.gf('django.db.models.fields.related.ForeignKey')(default=None, to=orm['auth.User'], null=True, on_delete=models.SET_NULL),
-                      keep_default=False)
-
-
-    def backwards(self, orm):
-        # Deleting field 'Member.user'
-        db.delete_column(u'members_member', 'user_id')
-
-
-    models = {
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'members.cryptokey': {
-            'Meta': {'object_name': 'CryptoKey'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '3'})
-        },
-        u'members.ldapgroup': {
-            'Meta': {'object_name': 'LdapGroup', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.ldapuser': {
-            'Meta': {'object_name': 'LdapUser', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.member': {
-            'Meta': {'object_name': 'Member'},
-            'address': ('django.db.models.fields.TextField', [], {}),
-            'city': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'country': ('django.db.models.fields.CharField', [], {'default': "'France'", 'max_length': '200'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
-            'entry_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'ldap_cn': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
-            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'status': ('django.db.models.fields.CharField', [], {'default': "'non_adherent'", 'max_length': '50'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'personne_physique'", 'max_length': '20'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'on_delete': 'models.SET_NULL'})
-        },
-        u'members.membershipfee': {
-            'Meta': {'object_name': 'MembershipFee'},
-            'amount': ('django.db.models.fields.IntegerField', [], {'default': "'20'"}),
-            'end_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2015, 4, 20, 0, 0)'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'membership_fees'", 'to': u"orm['members.Member']"}),
-            'start_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'})
-        }
-    }
-
-    complete_apps = ['members']

+ 0 - 108
coin/members/migrations/0009_auto__chg_field_member_user__add_unique_member_user.py

@@ -1,108 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-
-        # Changing field 'Member.user'
-        db.alter_column(u'members_member', 'user_id', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.User'], unique=True, null=True, on_delete=models.SET_NULL))
-        # Adding unique constraint on 'Member', fields ['user']
-        db.create_unique(u'members_member', ['user_id'])
-
-
-    def backwards(self, orm):
-        # Removing unique constraint on 'Member', fields ['user']
-        db.delete_unique(u'members_member', ['user_id'])
-
-
-        # Changing field 'Member.user'
-        db.alter_column(u'members_member', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True, on_delete=models.SET_NULL))
-
-    models = {
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'members.cryptokey': {
-            'Meta': {'object_name': 'CryptoKey'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '3'})
-        },
-        u'members.ldapgroup': {
-            'Meta': {'object_name': 'LdapGroup', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.ldapuser': {
-            'Meta': {'object_name': 'LdapUser', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.member': {
-            'Meta': {'object_name': 'Member'},
-            'address': ('django.db.models.fields.TextField', [], {}),
-            'city': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'country': ('django.db.models.fields.CharField', [], {'default': "'France'", 'max_length': '200'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
-            'entry_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'ldap_cn': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
-            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'status': ('django.db.models.fields.CharField', [], {'default': "'non_adherent'", 'max_length': '50'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'personne_physique'", 'max_length': '20'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'default': 'None', 'to': u"orm['auth.User']", 'unique': 'True', 'null': 'True', 'on_delete': 'models.SET_NULL'})
-        },
-        u'members.membershipfee': {
-            'Meta': {'object_name': 'MembershipFee'},
-            'amount': ('django.db.models.fields.IntegerField', [], {'default': "'20'"}),
-            'end_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2015, 4, 21, 0, 0)'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'membership_fees'", 'to': u"orm['members.Member']"}),
-            'start_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'})
-        }
-    }
-
-    complete_apps = ['members']

+ 0 - 117
coin/members/migrations/0010_auto__del_field_member_user__add_field_member_password__add_field_memb.py

@@ -1,117 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Deleting field 'Member.user'
-        db.delete_column(u'members_member', 'user_id')
-
-        # Adding field 'Member.password'
-        db.add_column(u'members_member', 'password',
-                      self.gf('django.db.models.fields.CharField')(default=None, max_length=128),
-                      keep_default=False)
-
-        # Adding field 'Member.last_login'
-        db.add_column(u'members_member', 'last_login',
-                      self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now),
-                      keep_default=False)
-
-
-        # Changing field 'Member.city'
-        db.alter_column(u'members_member', 'city', self.gf('django.db.models.fields.CharField')(max_length=200, null=True))
-
-        # Changing field 'Member.country'
-        db.alter_column(u'members_member', 'country', self.gf('django.db.models.fields.CharField')(max_length=200, null=True))
-
-        # Changing field 'Member.address'
-        db.alter_column(u'members_member', 'address', self.gf('django.db.models.fields.TextField')(null=True))
-        # Adding unique constraint on 'Member', fields ['ldap_cn']
-        db.create_unique(u'members_member', ['ldap_cn'])
-
-
-    def backwards(self, orm):
-        # Removing unique constraint on 'Member', fields ['ldap_cn']
-        db.delete_unique(u'members_member', ['ldap_cn'])
-
-        # Adding field 'Member.user'
-        db.add_column(u'members_member', 'user',
-                      self.gf('django.db.models.fields.related.OneToOneField')(default=None, to=orm['auth.User'], unique=True, null=True, on_delete=models.SET_NULL),
-                      keep_default=False)
-
-        # Deleting field 'Member.password'
-        db.delete_column(u'members_member', 'password')
-
-        # Deleting field 'Member.last_login'
-        db.delete_column(u'members_member', 'last_login')
-
-
-        # User chose to not deal with backwards NULL issues for 'Member.city'
-        raise RuntimeError("Cannot reverse this migration. 'Member.city' and its values cannot be restored.")
-        
-        # The following code is provided here to aid in writing a correct migration
-        # Changing field 'Member.city'
-        db.alter_column(u'members_member', 'city', self.gf('django.db.models.fields.CharField')(max_length=200))
-
-        # Changing field 'Member.country'
-        db.alter_column(u'members_member', 'country', self.gf('django.db.models.fields.CharField')(max_length=200))
-
-        # User chose to not deal with backwards NULL issues for 'Member.address'
-        raise RuntimeError("Cannot reverse this migration. 'Member.address' and its values cannot be restored.")
-        
-        # The following code is provided here to aid in writing a correct migration
-        # Changing field 'Member.address'
-        db.alter_column(u'members_member', 'address', self.gf('django.db.models.fields.TextField')())
-
-    models = {
-        u'members.cryptokey': {
-            'Meta': {'object_name': 'CryptoKey'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '3'})
-        },
-        u'members.ldapgroup': {
-            'Meta': {'object_name': 'LdapGroup', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.ldapuser': {
-            'Meta': {'object_name': 'LdapUser', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.member': {
-            'Meta': {'object_name': 'Member'},
-            'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'city': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'country': ('django.db.models.fields.CharField', [], {'default': "'France'", 'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
-            'entry_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'ldap_cn': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
-            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
-            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'status': ('django.db.models.fields.CharField', [], {'default': "'non_adherent'", 'max_length': '50'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'personne_physique'", 'max_length': '20'})
-        },
-        u'members.membershipfee': {
-            'Meta': {'object_name': 'MembershipFee'},
-            'amount': ('django.db.models.fields.IntegerField', [], {'default': "'20'"}),
-            'end_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2015, 8, 24, 0, 0)'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'membership_fees'", 'to': u"orm['members.Member']"}),
-            'start_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'})
-        }
-    }
-
-    complete_apps = ['members']

+ 0 - 116
coin/members/migrations/0011_auto__add_field_member_is_superuser.py

@@ -1,116 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding field 'Member.is_superuser'
-        db.add_column(u'members_member', 'is_superuser',
-                      self.gf('django.db.models.fields.BooleanField')(default=False),
-                      keep_default=False)
-
-        # Adding M2M table for field groups on 'Member'
-        m2m_table_name = db.shorten_name(u'members_member_groups')
-        db.create_table(m2m_table_name, (
-            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
-            ('member', models.ForeignKey(orm[u'members.member'], null=False)),
-            ('group', models.ForeignKey(orm[u'auth.group'], null=False))
-        ))
-        db.create_unique(m2m_table_name, ['member_id', 'group_id'])
-
-        # Adding M2M table for field user_permissions on 'Member'
-        m2m_table_name = db.shorten_name(u'members_member_user_permissions')
-        db.create_table(m2m_table_name, (
-            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
-            ('member', models.ForeignKey(orm[u'members.member'], null=False)),
-            ('permission', models.ForeignKey(orm[u'auth.permission'], null=False))
-        ))
-        db.create_unique(m2m_table_name, ['member_id', 'permission_id'])
-
-
-    def backwards(self, orm):
-        # Deleting field 'Member.is_superuser'
-        db.delete_column(u'members_member', 'is_superuser')
-
-        # Removing M2M table for field groups on 'Member'
-        db.delete_table(db.shorten_name(u'members_member_groups'))
-
-        # Removing M2M table for field user_permissions on 'Member'
-        db.delete_table(db.shorten_name(u'members_member_user_permissions'))
-
-
-    models = {
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'members.cryptokey': {
-            'Meta': {'object_name': 'CryptoKey'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '3'})
-        },
-        u'members.ldapgroup': {
-            'Meta': {'object_name': 'LdapGroup', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.ldapuser': {
-            'Meta': {'object_name': 'LdapUser', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.member': {
-            'Meta': {'object_name': 'Member'},
-            'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'city': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'country': ('django.db.models.fields.CharField', [], {'default': "'France'", 'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
-            'entry_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'ldap_cn': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
-            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
-            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'status': ('django.db.models.fields.CharField', [], {'default': "'non_adherent'", 'max_length': '50'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'personne_physique'", 'max_length': '20'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"})
-        },
-        u'members.membershipfee': {
-            'Meta': {'object_name': 'MembershipFee'},
-            'amount': ('django.db.models.fields.IntegerField', [], {'default': "'20'"}),
-            'end_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2015, 8, 24, 0, 0)'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'membership_fees'", 'to': u"orm['members.Member']"}),
-            'start_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'})
-        }
-    }
-
-    complete_apps = ['members']

+ 0 - 104
coin/members/migrations/0012_auto__del_field_member_ldap_cn__add_field_member_login.py

@@ -1,104 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Deleting field 'Member.ldap_cn'
-        db.delete_column(u'members_member', 'ldap_cn')
-
-        # Adding field 'Member.login'
-        db.add_column(u'members_member', 'login',
-                      self.gf('django.db.models.fields.CharField')(default=None, unique=True, max_length=200),
-                      keep_default=False)
-
-
-    def backwards(self, orm):
-
-        # User chose to not deal with backwards NULL issues for 'Member.ldap_cn'
-        raise RuntimeError("Cannot reverse this migration. 'Member.ldap_cn' and its values cannot be restored.")
-        
-        # The following code is provided here to aid in writing a correct migration        # Adding field 'Member.ldap_cn'
-        db.add_column(u'members_member', 'ldap_cn',
-                      self.gf('django.db.models.fields.CharField')(max_length=200, unique=True),
-                      keep_default=False)
-
-        # Deleting field 'Member.login'
-        db.delete_column(u'members_member', 'login')
-
-
-    models = {
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'members.cryptokey': {
-            'Meta': {'object_name': 'CryptoKey'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '3'})
-        },
-        u'members.ldapgroup': {
-            'Meta': {'object_name': 'LdapGroup', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.ldapuser': {
-            'Meta': {'object_name': 'LdapUser', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.member': {
-            'Meta': {'object_name': 'Member'},
-            'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'city': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'country': ('django.db.models.fields.CharField', [], {'default': "'France'", 'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
-            'entry_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'login': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
-            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
-            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'status': ('django.db.models.fields.CharField', [], {'default': "'non_adherent'", 'max_length': '50'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'personne_physique'", 'max_length': '20'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"})
-        },
-        u'members.membershipfee': {
-            'Meta': {'object_name': 'MembershipFee'},
-            'amount': ('django.db.models.fields.IntegerField', [], {'default': "'20'"}),
-            'end_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2015, 8, 24, 0, 0)'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'membership_fees'", 'to': u"orm['members.Member']"}),
-            'start_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'})
-        }
-    }
-
-    complete_apps = ['members']

+ 0 - 102
coin/members/migrations/0013_auto__add_field_member_is_active__add_field_member_is_admin.py

@@ -1,102 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding field 'Member.is_active'
-        db.add_column(u'members_member', 'is_active',
-                      self.gf('django.db.models.fields.BooleanField')(default=True),
-                      keep_default=False)
-
-        # Adding field 'Member.is_admin'
-        db.add_column(u'members_member', 'is_admin',
-                      self.gf('django.db.models.fields.BooleanField')(default=False),
-                      keep_default=False)
-
-
-    def backwards(self, orm):
-        # Deleting field 'Member.is_active'
-        db.delete_column(u'members_member', 'is_active')
-
-        # Deleting field 'Member.is_admin'
-        db.delete_column(u'members_member', 'is_admin')
-
-
-    models = {
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'members.cryptokey': {
-            'Meta': {'object_name': 'CryptoKey'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '3'})
-        },
-        u'members.ldapgroup': {
-            'Meta': {'object_name': 'LdapGroup', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.ldapuser': {
-            'Meta': {'object_name': 'LdapUser', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.member': {
-            'Meta': {'object_name': 'Member'},
-            'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'city': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'country': ('django.db.models.fields.CharField', [], {'default': "'France'", 'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
-            'entry_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_admin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'login': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
-            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
-            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'status': ('django.db.models.fields.CharField', [], {'default': "'non_adherent'", 'max_length': '50'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'personne_physique'", 'max_length': '20'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"})
-        },
-        u'members.membershipfee': {
-            'Meta': {'object_name': 'MembershipFee'},
-            'amount': ('django.db.models.fields.IntegerField', [], {'default': "'20'"}),
-            'end_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2015, 8, 24, 0, 0)'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'membership_fees'", 'to': u"orm['members.Member']"}),
-            'start_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'})
-        }
-    }
-
-    complete_apps = ['members']

+ 0 - 100
coin/members/migrations/0014_auto__del_field_member_is_active__del_field_member_is_admin.py

@@ -1,100 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Deleting field 'Member.is_active'
-        db.delete_column(u'members_member', 'is_active')
-
-        # Deleting field 'Member.is_admin'
-        db.delete_column(u'members_member', 'is_admin')
-
-
-    def backwards(self, orm):
-        # Adding field 'Member.is_active'
-        db.add_column(u'members_member', 'is_active',
-                      self.gf('django.db.models.fields.BooleanField')(default=True),
-                      keep_default=False)
-
-        # Adding field 'Member.is_admin'
-        db.add_column(u'members_member', 'is_admin',
-                      self.gf('django.db.models.fields.BooleanField')(default=False),
-                      keep_default=False)
-
-
-    models = {
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'members.cryptokey': {
-            'Meta': {'object_name': 'CryptoKey'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '3'})
-        },
-        u'members.ldapgroup': {
-            'Meta': {'object_name': 'LdapGroup', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.ldapuser': {
-            'Meta': {'object_name': 'LdapUser', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.member': {
-            'Meta': {'object_name': 'Member'},
-            'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'city': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'country': ('django.db.models.fields.CharField', [], {'default': "'France'", 'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
-            'entry_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'login': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
-            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
-            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'status': ('django.db.models.fields.CharField', [], {'default': "'non_adherent'", 'max_length': '50'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'personne_physique'", 'max_length': '20'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"})
-        },
-        u'members.membershipfee': {
-            'Meta': {'object_name': 'MembershipFee'},
-            'amount': ('django.db.models.fields.IntegerField', [], {'default': "'20'"}),
-            'end_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2015, 8, 24, 0, 0)'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'membership_fees'", 'to': u"orm['members.Member']"}),
-            'start_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'})
-        }
-    }
-
-    complete_apps = ['members']

+ 0 - 93
coin/members/migrations/0015_auto__add_field_member_is_active.py

@@ -1,93 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding field 'Member.is_active'
-        db.add_column(u'members_member', 'is_active',
-                      self.gf('django.db.models.fields.BooleanField')(default=True),
-                      keep_default=False)
-
-
-    def backwards(self, orm):
-        # Deleting field 'Member.is_active'
-        db.delete_column(u'members_member', 'is_active')
-
-
-    models = {
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'members.cryptokey': {
-            'Meta': {'object_name': 'CryptoKey'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '3'})
-        },
-        u'members.ldapgroup': {
-            'Meta': {'object_name': 'LdapGroup', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.ldapuser': {
-            'Meta': {'object_name': 'LdapUser', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.member': {
-            'Meta': {'object_name': 'Member'},
-            'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'city': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'country': ('django.db.models.fields.CharField', [], {'default': "'France'", 'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
-            'entry_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'login': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
-            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
-            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'status': ('django.db.models.fields.CharField', [], {'default': "'non_adherent'", 'max_length': '50'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'personne_physique'", 'max_length': '20'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"})
-        },
-        u'members.membershipfee': {
-            'Meta': {'object_name': 'MembershipFee'},
-            'amount': ('django.db.models.fields.IntegerField', [], {'default': "'20'"}),
-            'end_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2015, 8, 24, 0, 0)'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'membership_fees'", 'to': u"orm['members.Member']"}),
-            'start_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'})
-        }
-    }
-
-    complete_apps = ['members']

+ 0 - 94
coin/members/migrations/0016_auto__add_field_member_is_admin.py

@@ -1,94 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding field 'Member.is_admin'
-        db.add_column(u'members_member', 'is_admin',
-                      self.gf('django.db.models.fields.BooleanField')(default=False),
-                      keep_default=False)
-
-
-    def backwards(self, orm):
-        # Deleting field 'Member.is_admin'
-        db.delete_column(u'members_member', 'is_admin')
-
-
-    models = {
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'members.cryptokey': {
-            'Meta': {'object_name': 'CryptoKey'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '3'})
-        },
-        u'members.ldapgroup': {
-            'Meta': {'object_name': 'LdapGroup', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.ldapuser': {
-            'Meta': {'object_name': 'LdapUser', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.member': {
-            'Meta': {'object_name': 'Member'},
-            'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'city': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'country': ('django.db.models.fields.CharField', [], {'default': "'France'", 'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
-            'entry_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_admin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'login': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
-            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
-            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'status': ('django.db.models.fields.CharField', [], {'default': "'not_member'", 'max_length': '50'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'natural_person'", 'max_length': '20'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"})
-        },
-        u'members.membershipfee': {
-            'Meta': {'object_name': 'MembershipFee'},
-            'amount': ('django.db.models.fields.IntegerField', [], {'default': "'20'"}),
-            'end_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2015, 8, 24, 0, 0)'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'membership_fees'", 'to': u"orm['members.Member']"}),
-            'start_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'})
-        }
-    }
-
-    complete_apps = ['members']

+ 0 - 102
coin/members/migrations/0017_auto__del_field_member_is_admin__add_field_member_is_staff.py

@@ -1,102 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Deleting field 'Member.is_admin'
-        db.delete_column(u'members_member', 'is_admin')
-
-        # Adding field 'Member.is_staff'
-        db.add_column(u'members_member', 'is_staff',
-                      self.gf('django.db.models.fields.BooleanField')(default=False),
-                      keep_default=False)
-
-
-    def backwards(self, orm):
-        # Adding field 'Member.is_admin'
-        db.add_column(u'members_member', 'is_admin',
-                      self.gf('django.db.models.fields.BooleanField')(default=False),
-                      keep_default=False)
-
-        # Deleting field 'Member.is_staff'
-        db.delete_column(u'members_member', 'is_staff')
-
-
-    models = {
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'members.cryptokey': {
-            'Meta': {'object_name': 'CryptoKey'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '3'})
-        },
-        u'members.ldapgroup': {
-            'Meta': {'object_name': 'LdapGroup', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.ldapuser': {
-            'Meta': {'object_name': 'LdapUser', 'managed': 'False'},
-            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'members.member': {
-            'Meta': {'object_name': 'Member'},
-            'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'city': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'country': ('django.db.models.fields.CharField', [], {'default': "'France'", 'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
-            'entry_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'login': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
-            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
-            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
-            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '50'}),
-            'type': ('django.db.models.fields.CharField', [], {'default': "'natural_person'", 'max_length': '20'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"})
-        },
-        u'members.membershipfee': {
-            'Meta': {'object_name': 'MembershipFee'},
-            'amount': ('django.db.models.fields.IntegerField', [], {'default': "'20'"}),
-            'end_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2015, 8, 27, 0, 0)'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'member': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'membership_fees'", 'to': u"orm['members.Member']"}),
-            'start_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'})
-        }
-    }
-
-    complete_apps = ['members']

+ 4 - 11
coin/members/models.py

@@ -36,7 +36,7 @@ class CoinUserManager(BaseUserManager):
             last_name=last_name,
         )
 
-        user.set_password(password, ldap=False)
+        user.set_password(password)
         user.save(using=self._db)
         user.set_ldap_password(password)
         return user
@@ -76,7 +76,8 @@ class Member(CoinLdapSyncMixin, AbstractBaseUser, PermissionsMixin):
 
     objects = CoinUserManager()
     is_active = models.BooleanField(default=True)
-    is_staff = models.BooleanField(default=False)
+    is_staff = models.BooleanField(default=False, verbose_name='Administrateur COIN',
+                                    help_text='TODO')
 
     status = models.CharField(max_length=50, choices=MEMBER_STATUS_CHOICES,
                               default='pending')
@@ -87,7 +88,7 @@ class Member(CoinLdapSyncMixin, AbstractBaseUser, PermissionsMixin):
     login = models.CharField(max_length=200, unique=True, null=True,
                                blank=True,
                                verbose_name='login',
-                               help_text='Login. Clé avec le LDAP. Laisser vide pour '
+                               help_text='Clé avec le LDAP<br />Laisser vide pour '
                                'le générer automatiquement')
     organization_name = models.CharField(max_length=200, blank=True,
                                          verbose_name='Nom de l\'organisme',
@@ -148,14 +149,6 @@ class Member(CoinLdapSyncMixin, AbstractBaseUser, PermissionsMixin):
         else:
             return False
 
-    def set_password(self, new_password, ldap=True, *args, **kwargs):
-        """
-        Override set_password in order to change password in ldap too
-        """
-        super(Member, self).set_password(new_password, *args, **kwargs)
-        if ldap:
-            self.set_ldap_password(new_password)
-
     def set_ldap_password(self, new_password):
         """
         Change password in LDAP

+ 3 - 16
coin/members/views.py

@@ -10,23 +10,14 @@ def index(request):
 
 @login_required
 def detail(request):
-    if hasattr(request.user, 'member'):
-        member = request.user.member
-    else:
-        #TODO: logger: ce cas ne devrait pas exister
-        raise Http404
+    member = request.user
 
     return render_to_response('members/detail.html', {'member': member},
                               context_instance=RequestContext(request))
 
 @login_required
 def subscriptions(request):
-    if hasattr(request.user, 'member'):
-        member = request.user.member
-    else:
-        #TODO: logger: ce cas ne devrait pas exister
-        raise Http404
-
+    member = request.user
     subscriptions = member.get_active_subscriptions()
 
     return render_to_response('members/subscriptions.html',
@@ -35,11 +26,7 @@ def subscriptions(request):
 
 @login_required
 def invoices(request):
-    if hasattr(request.user, 'member'):
-        member = request.user.member
-    else:
-        #TODO: logger: ce cas ne devrait pas exister
-        raise Http404
+    member = request.user
 
     invoices = member.invoices.all().order_by('-date')
 

+ 1 - 1
coin/settings.py

@@ -252,7 +252,7 @@ AUTH_LDAP_USER_FLAGS_BY_GROUP = {
 }
 
 
-# Surcharge les paramètres en utilisant le fichier settings-local.py
+# Surcharge les paramètres en utilisant le fichier settings_local.py
 try:
     from settings_local import *
 except ImportError:

+ 9 - 0
coin/templates/admin/auth/user/add_form.html

@@ -0,0 +1,9 @@
+{% extends "admin/change_form.html" %}
+{% load i18n %}
+
+{% block form_top %}
+    \_o&lt;
+{% endblock %}
+
+{% block after_field_sets %}
+{% endblock %}