diff --git a/interface/migrations/0001_squashed_0004_alter_project_event_date.py b/interface/migrations/0001_initial.py similarity index 93% rename from interface/migrations/0001_squashed_0004_alter_project_event_date.py rename to interface/migrations/0001_initial.py index 8f0729b..8bb7558 100644 --- a/interface/migrations/0001_squashed_0004_alter_project_event_date.py +++ b/interface/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.7 on 2022-11-19 10:25 +# Generated by Django 3.2.7 on 2022-11-19 11:41 import byostorage.user from django.conf import settings @@ -9,8 +9,6 @@ import interface.models class Migration(migrations.Migration): - replaces = [('interface', '0001_initial'), ('interface', '0002_alter_module_name'), ('interface', '0003_alter_ensemble_slug'), ('interface', '0004_alter_project_event_date')] - initial = True dependencies = [ @@ -75,7 +73,7 @@ class Migration(migrations.Migration): name='Module', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.SlugField(choices=[('library', 'Library'), ('submissions', 'Submissions')], max_length=20)), + ('name', models.SlugField(choices=[('library', 'Library')], max_length=20)), ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='modules', to='interface.project')), ], ), diff --git a/library/migrations/0001_squashed_0006_auto_20221119_2121.py b/library/migrations/0001_initial.py similarity index 94% rename from library/migrations/0001_squashed_0006_auto_20221119_2121.py rename to library/migrations/0001_initial.py index 4adec22..887719b 100644 --- a/library/migrations/0001_squashed_0006_auto_20221119_2121.py +++ b/library/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.7 on 2022-11-19 10:24 +# Generated by Django 3.2.7 on 2022-11-19 11:41 import byostorage.user from django.conf import settings @@ -9,13 +9,11 @@ import library.models class Migration(migrations.Migration): - replaces = [('library', '0001_initial'), ('library', '0002_auto_20221118_2208'), ('library', '0003_work_composer'), ('library', '0004_auto_20221118_2223'), ('library', '0005_auto_20221118_2253'), ('library', '0006_auto_20221119_2121')] - initial = True dependencies = [ - ('byostorage', '0004_alter_userstorage_storage'), ('interface', '0001_initial'), + ('byostorage', '0004_alter_userstorage_storage'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] @@ -32,6 +30,16 @@ class Migration(migrations.Migration): ('storage', models.ForeignKey(blank=True, help_text='User storage for documents', null=True, on_delete=django.db.models.deletion.CASCADE, to='byostorage.userstorage')), ], ), + migrations.CreateModel( + name='Document', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('doctype', models.PositiveSmallIntegerField(choices=[(1, 'PDF'), (2, 'Audio'), (3, 'Video'), (4, 'Source')], default=1)), + ('upload', models.FileField(storage=byostorage.user.BYOStorage(), upload_to=library.models.doc_upload_filename)), + ('created', models.DateTimeField(auto_now_add=True)), + ('version', models.CharField(blank=True, max_length=30)), + ], + ), migrations.CreateModel( name='ProjectItem', fields=[ @@ -40,6 +48,7 @@ class Migration(migrations.Migration): ('due', models.DateTimeField(blank=True, null=True)), ('returned', models.DateTimeField(blank=True, null=True)), ('order', models.SmallIntegerField(default=0)), + ('section', models.CharField(blank=True, max_length=100)), ('approved_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='interface.project')), ], @@ -53,6 +62,8 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('slug', models.SlugField(editable=False, help_text='Used as folder name', max_length=100)), ('name', models.CharField(help_text='Original name of the work', max_length=255)), + ('edition', models.CharField(blank=True, help_text='Edition details to distinguish multiple versions', max_length=255)), + ('composer', models.CharField(blank=True, help_text='Surname, First Name/Initials', max_length=255)), ('original_parts', models.JSONField(blank=True, default=dict, help_text='Original printed parts (IMSLP format)')), ('code', models.CharField(blank=True, help_text='Collection specific code or number', max_length=100)), ('licence', models.PositiveSmallIntegerField(choices=[(2, 'Public Domain'), (4, 'Copyright Expired'), (6, 'Copyrighted'), (10, 'Internal use only')], default=6, help_text='Copyright status')), @@ -62,36 +73,6 @@ class Migration(migrations.Migration): ('collection', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='works', to='library.collection')), ('parent', models.ForeignKey(blank=True, help_text='Arrangement of another work or part of an anthology', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='related_works', to='library.work')), ('projects', models.ManyToManyField(help_text='Current usage', related_name='works', through='library.ProjectItem', to='interface.Project')), - ('composer', models.CharField(blank=True, help_text='Surname, First Name/Initials', max_length=255)), - ('edition', models.CharField(blank=True, help_text='Edition details to distinguish multiple versions', max_length=255)), - ], - ), - migrations.AddField( - model_name='projectitem', - name='work', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_items', to='library.work'), - ), - migrations.CreateModel( - name='EnsembleAccess', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('access_type', models.PositiveSmallIntegerField(choices=[(1, 'Unlimited'), (2, 'Approval required')], default=2)), - ('collection', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='allowed_ensembles', to='library.collection')), - ('ensemble', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='allowed_collections', to='interface.ensemble')), - ], - options={ - 'verbose_name_plural': 'Ensemble access', - }, - ), - migrations.CreateModel( - name='Document', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('doctype', models.PositiveSmallIntegerField(choices=[(1, 'PDF'), (2, 'Audio'), (3, 'Video'), (4, 'Source')], default=1)), - ('upload', models.FileField(storage=byostorage.user.BYOStorage(), upload_to=library.models.doc_upload_filename)), - ('created', models.DateTimeField(auto_now_add=True)), - ('version', models.CharField(blank=True, max_length=30)), - ('work', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='docs', to='library.work')), ], ), migrations.CreateModel( @@ -116,4 +97,26 @@ class Migration(migrations.Migration): 'ordering': ['doc', 'start', 'pk'], }, ), + migrations.AddField( + model_name='projectitem', + name='work', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_items', to='library.work'), + ), + migrations.CreateModel( + name='EnsembleAccess', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('access_type', models.PositiveSmallIntegerField(choices=[(1, 'Unlimited'), (2, 'Approval required')], default=2)), + ('collection', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='allowed_ensembles', to='library.collection')), + ('ensemble', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='allowed_collections', to='interface.ensemble')), + ], + options={ + 'verbose_name_plural': 'Ensemble access', + }, + ), + migrations.AddField( + model_name='document', + name='work', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='docs', to='library.work'), + ), ] diff --git a/manage.py b/manage.py index 2c318bb..6931cd7 100755 --- a/manage.py +++ b/manage.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Django's command-line utility for administrative tasks.""" import os import sys