From 8200feb954cb14a48914e7bd56f9b7d2b814772a Mon Sep 17 00:00:00 2001 From: Christian Dresen <c.dresen@fh-muenster.de> Date: Tue, 25 Apr 2017 21:54:29 +0200 Subject: [PATCH] Fixed Migrations --- www/web/warpauth/migrations/0001_initial.py | 28 ++++++++++----------- www/web/warpauth/models.py | 6 +++++ 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/www/web/warpauth/migrations/0001_initial.py b/www/web/warpauth/migrations/0001_initial.py index 984a334..21f0b04 100644 --- a/www/web/warpauth/migrations/0001_initial.py +++ b/www/web/warpauth/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9 on 2017-03-14 21:49 +# Generated by Django 1.10 on 2017-04-25 21:48 from __future__ import unicode_literals from django.db import migrations, models @@ -14,26 +14,16 @@ class Migration(migrations.Migration): ] operations = [ - migrations.CreateModel( - name='ActivationToken', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('user', models.CharField(max_length=100)), - ('email', models.CharField(max_length=100)), - ('token', models.CharField(max_length=100)), - ('created', models.DateTimeField(auto_now_add=True)), - ], - ), migrations.CreateModel( name='LdapGroup', fields=[ ('dn', models.CharField(max_length=200, primary_key=True, serialize=False)), - ('gid', ldapdb.models.fields.IntegerField(db_column='gidNumber', unique=True)), + ('gid', ldapdb.models.fields.IntegerField(db_column='gidNumber')), ('name', ldapdb.models.fields.CharField(db_column='cn', max_length=200, primary_key=True, serialize=False)), ('members', ldapdb.models.fields.ListField(db_column='uniqueMember')), ], options={ - 'abstract': False, + 'managed': False, }, ), migrations.CreateModel( @@ -48,9 +38,19 @@ class Migration(migrations.Migration): ('card_id', ldapdb.models.fields.CharField(db_column='employeeNumber', max_length=200)), ], options={ - 'abstract': False, + 'managed': False, }, ), + migrations.CreateModel( + name='ActivationToken', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('user', models.CharField(max_length=100)), + ('email', models.CharField(max_length=100)), + ('token', models.CharField(max_length=100)), + ('created', models.DateTimeField(auto_now_add=True)), + ], + ), migrations.CreateModel( name='PasswordResetToken', fields=[ diff --git a/www/web/warpauth/models.py b/www/web/warpauth/models.py index b850c29..2c7bd34 100644 --- a/www/web/warpauth/models.py +++ b/www/web/warpauth/models.py @@ -26,6 +26,9 @@ class ActivationToken(models.Model): class LdapUser(ldapdb.models.Model): + class Meta: + managed = False + base_dn = "ou=users,dc=warpzone,dc=ms" object_classes = ['inetOrgPerson'] @@ -50,6 +53,9 @@ class LdapUserForm(ModelForm): class LdapGroup(ldapdb.models.Model): + class Meta: + managed = False + base_dn = "ou=groups,dc=warpzone,dc=ms" object_classes = ['groupOfUniqueNames'] -- GitLab