0x2620
/
pandora
2
1
Fork 1
Code Issues 1.3k Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'wjt/fix-migrations'

This commit is contained in:
j 2016-05-05 10:48:24 +02:00
parent 0f28a2b7d5 39b9b48be2
commit be163826ef
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora/archive/migrations/0001_initial.py
View File

@ -57,7 +57,7 @@ class Migration(migrations.Migration):
('is_audio', models.BooleanField(default=False)),
('is_video', models.BooleanField(default=False)),
('is_subtitle', models.BooleanField(default=False)),
('data', models.FileField(blank=True, null=True, upload_to=archive.models.get_data_path)),
('data', models.FileField(blank=True, null=True, upload_to=archive.models.data_path)),
],
),
migrations.CreateModel(
@ -93,7 +93,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('resolution', models.IntegerField(default=96)),
('format', models.CharField(default=b'webm', max_length=255)),
('media', models.FileField(blank=True, default=None, upload_to=archive.models.get_path)),
('media', models.FileField(blank=True, default=None, upload_to=archive.models.stream_path)),
('available', models.BooleanField(default=False)),
('oshash', models.CharField(db_index=True, max_length=16, null=True)),
('info', oxdjango.fields.DictField(default={})),

21
pandora/entity/migrations/0004_related_name_Document_documentproperties.py Normal file
View File

@ -0,0 +1,21 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2016-04-21 06:23
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('entity', '0003_documentproperties_data'),
]
operations = [
migrations.AlterField(
model_name='documentproperties',
name='document',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='documentproperties', to='document.Document'),
),
]