From 7c830ee7e5bf94759c234001480eab27fcf86ff9 Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Tue, 28 Dec 2021 11:46:47 +0000 Subject: [PATCH] Fix sorting of items W.T.F past self. Char field for a reference number?! --- .../migrations/0010_auto_20211228_1144.py | 23 +++++++++++++++++++ training/models.py | 4 ++-- training/templates/item_list.html | 4 ++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 training/migrations/0010_auto_20211228_1144.py diff --git a/training/migrations/0010_auto_20211228_1144.py b/training/migrations/0010_auto_20211228_1144.py new file mode 100644 index 00000000..f1e54e32 --- /dev/null +++ b/training/migrations/0010_auto_20211228_1144.py @@ -0,0 +1,23 @@ +# Generated by Django 3.1.13 on 2021-12-28 11:44 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('training', '0009_auto_20211221_1539'), + ] + + operations = [ + migrations.AlterField( + model_name='trainingcategory', + name='reference_number', + field=models.IntegerField(unique=True), + ), + migrations.AlterField( + model_name='trainingitem', + name='reference_number', + field=models.IntegerField(), + ), + ] diff --git a/training/models.py b/training/models.py index f314deb7..d7cf3c26 100644 --- a/training/models.py +++ b/training/models.py @@ -46,7 +46,7 @@ class Trainee(Profile, RevisionMixin): class TrainingCategory(models.Model): - reference_number = models.CharField(max_length=3, unique=True) + reference_number = models.IntegerField(unique=True) name = models.CharField(max_length=50) def __str__(self): @@ -57,7 +57,7 @@ class TrainingCategory(models.Model): class TrainingItem(models.Model): - reference_number = models.CharField(max_length=3) + reference_number = models.IntegerField() category = models.ForeignKey('TrainingCategory', related_name='items', on_delete=models.RESTRICT) name = models.CharField(max_length=50) active = models.BooleanField(default = True) diff --git a/training/templates/item_list.html b/training/templates/item_list.html index 3f459458..62a09d59 100644 --- a/training/templates/item_list.html +++ b/training/templates/item_list.html @@ -13,7 +13,11 @@
{% for item in category.items.all %} + {% if item.active %}
  • {{ item }}
  • + {% elif request.user.is_superuser %} +
  • {{ item }} (inactive)
  • + {% endif %} {% endfor %}