diff --git a/AKModel/fixtures/model.json b/AKModel/fixtures/model.json index 8616676120790a1348f967ff5836c5925103af66..3ef181bcb612f7eb3708077069f597a90ef44a7e 100644 --- a/AKModel/fixtures/model.json +++ b/AKModel/fixtures/model.json @@ -214,7 +214,6 @@ "reso": false, "present": true, "notes": "", - "interest": -1, "category": 4, "track": null, "event": 2, @@ -237,7 +236,6 @@ "reso": false, "present": true, "notes": "", - "interest": -1, "category": 4, "track": null, "event": 2, @@ -260,7 +258,6 @@ "reso": false, "present": null, "notes": "", - "interest": -1, "category": 5, "track": null, "event": 2, @@ -283,7 +280,6 @@ "reso": false, "present": null, "notes": "", - "interest": -1, "category": 5, "track": null, "event": 2, @@ -306,7 +302,6 @@ "reso": false, "present": null, "notes": "We need to find a volunteer first...", - "interest": -1, "category": 3, "track": null, "event": 2, @@ -329,7 +324,6 @@ "reso": false, "present": null, "notes": "We need to find a volunteer first...", - "interest": -1, "category": 3, "track": null, "event": 2, @@ -352,7 +346,6 @@ "reso": false, "present": null, "notes": "", - "interest": -1, "category": 5, "track": 1, "event": 2, diff --git a/AKModel/migrations/0062_interest_no_history.py b/AKModel/migrations/0062_interest_no_history.py new file mode 100644 index 0000000000000000000000000000000000000000..bad3647a25231487948abc86efa2c9d30d2852fb --- /dev/null +++ b/AKModel/migrations/0062_interest_no_history.py @@ -0,0 +1,17 @@ +# Generated by Django 4.2.13 on 2025-02-26 22:35 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('AKModel', '0061_types'), + ] + + operations = [ + migrations.RemoveField( + model_name='historicalak', + name='interest', + ), + ] diff --git a/AKModel/models.py b/AKModel/models.py index 26ed0f2142a94b8435b91647c161617face6d433..92925a1cdbf3bcf52297284daeebe0a1c1bcba41 100644 --- a/AKModel/models.py +++ b/AKModel/models.py @@ -374,7 +374,7 @@ class AK(models.Model): include_in_export = models.BooleanField(default=True, verbose_name=_('Export?'), help_text=_("Include AK in wiki export?")) - history = HistoricalRecords(excluded_fields=['interest_counter', 'include_in_export']) + history = HistoricalRecords(excluded_fields=['interest', 'interest_counter', 'include_in_export']) class Meta: verbose_name = _('AK') diff --git a/AKScheduling/views.py b/AKScheduling/views.py index d7533f3d4b0eec0b6bef82cf1a3159216a62cf9d..ea8d1cc4981bb79999ecc5f80263a1cf052bee94 100644 --- a/AKScheduling/views.py +++ b/AKScheduling/views.py @@ -154,6 +154,13 @@ class InterestEnteringAdminView(SuccessMessageMixin, AdminViewMixin, EventSlugMi def get_success_url(self): return self.request.path + def form_valid(self, form): + # Don't create a history entry for this change + form.instance.skip_history_when_saving = True + r = super().form_valid(form) + del form.instance.skip_history_when_saving + return r + def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) context["title"] = f"{_('Enter interest')}"