Made fundraising views generate initial id in admin.

2 files changed, 15 insertions, 2 deletions

diff --git a/fundraising/admin.py b/fundraising/admin.py
index 2059e82a..a99f5e9b 100644
--- a/fundraising/admin.py
+++ b/fundraising/admin.py
@@ -3,7 +3,10 @@ from django.db.models import Sum
 from sorl.thumbnail.admin import AdminImageMixin
 
 from .admin_views import download_donor_report
-from .models import DjangoHero, Donation, InKindDonor, Payment, Testimonial
+from .models import (
+    DjangoHero, Donation, InKindDonor, Payment, Testimonial,
+    get_fundraising_id,
+)
 
 
 class DonatedFilter(admin.DateFieldListFilter):
@@ -31,6 +34,9 @@ class DjangoHeroAdmin(AdminImageMixin, admin.ModelAdmin):
     ordering = ['-created']
     search_fields = ['name', 'email', 'stripe_customer_id']
 
+    def get_changeform_initial_data(self, request):
+        return {'id': get_fundraising_id()}
+
 
 class PaymentInline(admin.TabularInline):
     readonly_fields = ['date']
@@ -58,6 +64,9 @@ class Donation(admin.ModelAdmin):
         # references it.
         return obj.amount
 
+    def get_changeform_initial_data(self, request):
+        return {'id': get_fundraising_id()}
+
 
 @admin.register(Payment)
 class PaymentAdmin(admin.ModelAdmin):
diff --git a/fundraising/models.py b/fundraising/models.py
index ff8d1479..b93b23df 100644
--- a/fundraising/models.py
+++ b/fundraising/models.py
@@ -31,6 +31,10 @@ class DjangoHeroManager(models.Manager):
         return donors.order_by('-donated_amount', 'name')
 
 
+def get_fundraising_id():
+    return crypto.get_random_string(length=12)
+
+
 class FundraisingModel(models.Model):
     id = models.CharField(max_length=12, primary_key=True)
     created = models.DateTimeField(default=timezone.now)
@@ -42,7 +46,7 @@ class FundraisingModel(models.Model):
     def save(self, *args, **kwargs):
         self.modified = timezone.now()
         if not self.id:
-            self.id = crypto.get_random_string(length=12)
+            self.id = get_fundraising_id()
         return super().save(*args, **kwargs)