diff --git a/longs/admin.py b/longs/admin.py index 88704996..a41d0498 100755 --- a/longs/admin.py +++ b/longs/admin.py @@ -53,7 +53,7 @@ class LongAdminForm(ModelForm): "model_differential_diagnosis", "model_management", "author", - "sorted_series", + "series", ] widgets = { diff --git a/longs/migrations/0042_auto_20210811_1837.py b/longs/migrations/0042_auto_20210811_1837.py new file mode 100644 index 00000000..11c4a9c1 --- /dev/null +++ b/longs/migrations/0042_auto_20210811_1837.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.5 on 2021-08-11 17:37 + +from django.db import migrations +import sortedm2m.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('longs', '0041_long_sorted_series'), + ] + + operations = [ + migrations.RemoveField( + model_name='longseries', + name='long', + ), + migrations.AlterField( + model_name='long', + name='sorted_series', + field=sortedm2m.fields.SortedManyToManyField(help_text=None, related_name='long', to='longs.LongSeries'), + ), + ] diff --git a/longs/migrations/0043_rename_sorted_series_long_series.py b/longs/migrations/0043_rename_sorted_series_long_series.py new file mode 100644 index 00000000..a599b4ce --- /dev/null +++ b/longs/migrations/0043_rename_sorted_series_long_series.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.5 on 2021-08-11 17:38 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('longs', '0042_auto_20210811_1837'), + ] + + operations = [ + migrations.RenameField( + model_name='long', + old_name='sorted_series', + new_name='series', + ), + ] diff --git a/longs/models.py b/longs/models.py index d05e1899..e1c36215 100644 --- a/longs/models.py +++ b/longs/models.py @@ -130,7 +130,7 @@ class Long(models.Model): question_json_id = models.IntegerField(default=1, help_text="Auto incrementing json creation number") - sorted_series = SortedManyToManyField("LongSeries", related_name="long_sorted") + series = SortedManyToManyField("LongSeries", related_name="long") #question_file = models.FileField(upload_to=question_file_directory_path, blank=True, null=True) @@ -340,12 +340,12 @@ class LongSeries(models.Model): null=True, blank=True, ) - long = models.ManyToManyField( - "Long", - help_text="The question(s) this series should be associated with", - related_name="series", - blank=True, - ) + #long = models.ManyToManyField( + # "Long", + # help_text="The question(s) this series should be associated with", + # related_name="series", + # blank=True, + #) description = models.TextField( blank=True, help_text="Description of stack, for admin organisation, will not be visible when taking", diff --git a/longs/templates/longs/long_display_block.html b/longs/templates/longs/long_display_block.html index 5b90e4c4..3c4e8075 100755 --- a/longs/templates/longs/long_display_block.html +++ b/longs/templates/longs/long_display_block.html @@ -15,23 +15,6 @@ {{series.get_block}} -Popup - - - {% endfor %} - Add new series - - - Sorted Series: - {% for series in question.sorted_series.all %} - - - Series {{ forloop.counter }}: - - {{series.get_block}} - - Popup