diff --git a/lectures/admin.py b/lectures/admin.py index bb880f7ccd510e9a0f30a2e4358552ccef0c1f9b..552b6cfb03b946bbaa11d2aac3523ba7145b3782 100644 --- a/lectures/admin.py +++ b/lectures/admin.py @@ -22,6 +22,8 @@ class LectureGroupAdmin(MarkdownxGuardedModelAdmin): autocomplete_fields = ("user_groups",) search_fields = ("name",) + list_display = ("name", "priority") + class LectureLectorInline(admin.StackedInline): model = LectureLector @@ -47,6 +49,7 @@ class LectureAdmin(MarkdownxGuardedModelAdmin): autocomplete_fields = ("groups",) search_fields = ("name", "description") + list_display = ( "name", "timestamp", diff --git a/lectures/migrations/0017_merge_20230526_0027.py b/lectures/migrations/0017_merge_20230526_0027.py new file mode 100644 index 0000000000000000000000000000000000000000..808d94a6506a9a2808e282add7595a1c0696e2d7 --- /dev/null +++ b/lectures/migrations/0017_merge_20230526_0027.py @@ -0,0 +1,14 @@ +# Generated by Django 4.1.4 on 2023-05-25 22:27 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('lectures', '0016_alter_lecture_groups'), + ('lectures', '0016_alter_lecturegroup_user_groups'), + ] + + operations = [ + ] diff --git a/lectures/migrations/0018_alter_lecturegroup_options_lecturegroup_priority.py b/lectures/migrations/0018_alter_lecturegroup_options_lecturegroup_priority.py new file mode 100644 index 0000000000000000000000000000000000000000..2eb6da0afcbcfd4b440c1d1dea063bf58ac7ca5b --- /dev/null +++ b/lectures/migrations/0018_alter_lecturegroup_options_lecturegroup_priority.py @@ -0,0 +1,23 @@ +# Generated by Django 4.1.4 on 2023-05-25 22:27 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('lectures', '0017_merge_20230526_0027'), + ] + + operations = [ + migrations.AlterModelOptions( + name='lecturegroup', + options={'ordering': ('priority', 'name'), 'verbose_name': 'Výuková skupina', 'verbose_name_plural': 'Výukové skupiny'}, + ), + migrations.AddField( + model_name='lecturegroup', + name='priority', + field=models.IntegerField(default=0, help_text='Čím nižší číslo, tím výš se skupina zobrazí.', verbose_name='Priorita'), + preserve_default=False, + ), + ] diff --git a/lectures/models.py b/lectures/models.py index 08254a47d7869ecad2707b2acd052f9ed24615a7..02314de4689025f2756db8abf900e15b25d2df29 100644 --- a/lectures/models.py +++ b/lectures/models.py @@ -26,6 +26,11 @@ class LectureGroup(NameStrMixin, models.Model): help_text="Můžeš použít Markdown.", ) + priority = models.IntegerField( + verbose_name="Priorita", + help_text="Čím nižší číslo, tím výš se skupina zobrazí." + ) + user_groups = models.ManyToManyField( Group, blank=True, @@ -36,7 +41,7 @@ class LectureGroup(NameStrMixin, models.Model): class Meta: verbose_name = "Výuková skupina" verbose_name_plural = "Výukové skupiny" - ordering = ("name",) + ordering = ("priority", "name") class Lecture(NameStrMixin, models.Model):