1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2025-07-31 12:41:08 +00:00

Migrate to django 2.2.4

The django.core.urlresolvers module is removed in favor of its new location, django.urls.
The on_delete argument for ForeignKey and OneToOneField is required in models and migrations.
This commit is contained in:
Gao Jiangmiao 2019-08-16 13:07:59 +08:00
parent a4d74a09a6
commit 3488661dc9
16 changed files with 20 additions and 19 deletions

View file

@ -1,5 +1,6 @@
from django.db import models, migrations
from django.conf import settings
from django.db.models import CASCADE
class Migration(migrations.Migration):
@ -16,8 +17,8 @@ class Migration(migrations.Migration):
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('is_change', models.BooleanField(default=False)),
('is_delete', models.BooleanField(default=False)),
('instance', models.ForeignKey(to='instances.Instance')),
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
('instance', models.ForeignKey(to='instances.Instance', on_delete=CASCADE)),
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=CASCADE)),
],
options={
},

View file

@ -1,5 +1,6 @@
from django.db import models, migrations
from django.conf import settings
from django.db.models import CASCADE
class Migration(migrations.Migration):
@ -16,7 +17,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('keyname', models.CharField(max_length=25)),
('keypublic', models.CharField(max_length=500)),
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=CASCADE)),
],
),
]

View file

@ -1,5 +1,6 @@
from django.db import models, migrations
from django.conf import settings
from django.db.models import CASCADE
class Migration(migrations.Migration):
@ -17,7 +18,7 @@ class Migration(migrations.Migration):
('max_instances', models.IntegerField(default=0)),
('max_cpus', models.IntegerField(default=0)),
('max_memory', models.IntegerField(default=0)),
('user', models.OneToOneField(to=settings.AUTH_USER_MODEL)),
('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, on_delete=CASCADE)),
],
),
]

View file

@ -1,6 +1,6 @@
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
from django.db.models import DO_NOTHING
class Migration(migrations.Migration):
@ -13,6 +13,6 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='usersshkey',
name='user',
field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL),
field=models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=DO_NOTHING),
),
]

View file

@ -1,6 +1,6 @@
from django.shortcuts import render
from django.http import HttpResponseRedirect
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
from django.contrib.auth.models import User
from django.contrib.auth.decorators import login_required