Merge remote-tracking branch 'origin/master' into release

2017-01-20 15:09:24 -05:00 · 2017-01-20 15:09:24 -05:00 · 11b34e8795
commit 11b34e8795
parent 87c8413686 76d095991c
1 changed files with 6 additions and 5 deletions
--- a/dbfilestorage/migrations/0002_add_filehash_rename_files.py
+++ b/dbfilestorage/migrations/0002_add_filehash_rename_files.py
@ -27,17 +27,18 @@ class Migration(migrations.Migration):
    ]

    operations = [
+        migrations.AlterField(
+            model_name='dbfile',
+            name='name',
+            field=models.CharField(max_length=100),
+        ),
        migrations.AddField(
            model_name='dbfile',
            name='filehash',
            field=models.CharField(default='filehash', max_length=32, primary_key=True, serialize=False),
            preserve_default=False,
        ),
-        migrations.AlterField(
-            model_name='dbfile',
-            name='name',
-            field=models.CharField(max_length=100),
-        ),
+
        migrations.RunPython(copy_filehash),
        migrations.RunPython(fix_filename),
    ]