Authtoken migrations merge (0001 and 0002) for django-tenants support

This commit is contained in:
Daniel 2016-08-18 10:19:26 -05:00
parent 382ea770b5
commit 0653d41a0f
2 changed files with 5 additions and 37 deletions

View File

@ -15,11 +15,13 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='Token', name='Token',
fields=[ fields=[
('key', models.CharField(primary_key=True, serialize=False, max_length=40)), ('key', models.CharField(verbose_name='Key',primary_key=True, serialize=False, max_length=40)),
('created', models.DateTimeField(auto_now_add=True)), ('created', models.DateTimeField(verbose_name='Created',auto_now_add=True)),
('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, related_name='auth_token', on_delete=models.CASCADE)), ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, verbose_name='User', related_name='auth_token')),
], ],
options={ options={
'verbose_name_plural': 'Tokens',
'verbose_name': 'Token'
}, },
bases=(models.Model,), bases=(models.Model,),
), ),

View File

@ -1,34 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('authtoken', '0001_initial'),
]
operations = [
migrations.AlterModelOptions(
name='token',
options={'verbose_name_plural': 'Tokens', 'verbose_name': 'Token'},
),
migrations.AlterField(
model_name='token',
name='created',
field=models.DateTimeField(verbose_name='Created', auto_now_add=True),
),
migrations.AlterField(
model_name='token',
name='key',
field=models.CharField(verbose_name='Key', max_length=40, primary_key=True, serialize=False),
),
migrations.AlterField(
model_name='token',
name='user',
field=models.OneToOneField(to=settings.AUTH_USER_MODEL, verbose_name='User', related_name='auth_token', on_delete=models.CASCADE),
),
]