Skip to content

Commit 630f2e3

Browse files
committed
Remove simple history change reason
This is a temporary fix until the underlying issue is fixed.
1 parent 47c2ee1 commit 630f2e3

3 files changed

Lines changed: 28 additions & 19 deletions

File tree

‎adserver/forms.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
from django.utils.text import slugify
2929
from django.utils.translation import gettext
3030
from django.utils.translation import gettext_lazy as _
31-
from simple_history.utils import update_change_reason
3231

3332
from .models import Advertisement
3433
from .models import Campaign
@@ -1358,7 +1357,8 @@ def save(self, commit=True):
13581357
user.invite_user()
13591358

13601359
# Track who added this user
1361-
update_change_reason(user, "Invited via authorized users view")
1360+
# See: https://github.com/jazzband/django-simple-history/issues/1181
1361+
# update_change_reason(user, "Invited via authorized users view")
13621362

13631363
# You will need to add the user to the publisher/advertiser in the view
13641364
return user

‎adserver/staff/forms.py‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
from django.utils.text import slugify
1818
from django.utils.translation import gettext_lazy as _
1919
from djstripe.models import Customer
20-
from simple_history.utils import update_change_reason
2120

2221
from ..constants import EMAILED
2322
from ..constants import PUBLISHER_HOUSE_CAMPAIGN
@@ -110,7 +109,10 @@ def create_user(self):
110109
user_email = self.cleaned_data["user_email"]
111110

112111
user = User.objects.create_user(name=user_name, email=user_email, password="")
113-
update_change_reason(user, self.message)
112+
113+
# See: https://github.com/jazzband/django-simple-history/issues/1181
114+
# update_change_reason(user, self.message)
115+
114116
if hasattr(user, "invite_user"):
115117
user.invite_user()
116118
return user
@@ -134,7 +136,7 @@ def create_advertiser(self):
134136
campaign.publisher_groups.add(pub_group)
135137

136138
flight_name = f"{advertiser_name} Initial Flight"
137-
flight = Flight.objects.create(
139+
Flight.objects.create(
138140
campaign=campaign,
139141
name=flight_name,
140142
slug=slugify(flight_name),
@@ -145,9 +147,10 @@ def create_advertiser(self):
145147
},
146148
)
147149

148-
update_change_reason(advertiser, self.message)
149-
update_change_reason(campaign, self.message)
150-
update_change_reason(flight, self.message)
150+
# See https://github.com/jazzband/django-simple-history/issues/1181
151+
# update_change_reason(advertiser, self.message)
152+
# update_change_reason(campaign, self.message)
153+
# update_change_reason(flight, self.message)
151154

152155
return advertiser
153156

@@ -256,7 +259,10 @@ def create_user(self):
256259
user_email = self.cleaned_data["user_email"]
257260

258261
user = User.objects.create_user(name=user_name, email=user_email, password="")
259-
update_change_reason(user, self.message)
262+
263+
# See https://github.com/jazzband/django-simple-history/issues/1181
264+
# update_change_reason(user, self.message)
265+
260266
if hasattr(user, "invite_user"):
261267
user.invite_user()
262268
return user
@@ -277,7 +283,8 @@ def create_publisher(self):
277283
if group_obj:
278284
group_obj.publishers.add(publisher)
279285

280-
update_change_reason(publisher, self.message)
286+
# See: https://github.com/jazzband/django-simple-history/issues/1181
287+
# update_change_reason(publisher, self.message)
281288

282289
# Create this publisher's advertiser account
283290
self.create_publisher_advertiser_account(publisher)
@@ -305,7 +312,7 @@ def create_publisher_advertiser_account(self, publisher):
305312
campaign.publisher_groups.add(pub_group)
306313

307314
flight_name = f"{publisher.name} House Ads"
308-
flight = Flight.objects.create(
315+
Flight.objects.create(
309316
campaign=campaign,
310317
name=flight_name,
311318
slug=slugify(flight_name),
@@ -316,9 +323,10 @@ def create_publisher_advertiser_account(self, publisher):
316323
},
317324
)
318325

319-
update_change_reason(advertiser, self.message)
320-
update_change_reason(campaign, self.message)
321-
update_change_reason(flight, self.message)
326+
# See: https://github.com/jazzband/django-simple-history/issues/1181
327+
# update_change_reason(advertiser, self.message)
328+
# update_change_reason(campaign, self.message)
329+
# update_change_reason(flight, self.message)
322330

323331
def save(self):
324332
"""Create the publisher and associated objects. Send the invitation to the user account."""
@@ -408,6 +416,7 @@ def save(self):
408416
status=EMAILED,
409417
)
410418

411-
update_change_reason(payout, "Payout via staff interface")
419+
# See: https://github.com/jazzband/django-simple-history/issues/1181
420+
# update_change_reason(payout, "Payout via staff interface")
412421

413422
return payout

‎adserver/tasks.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
from django.utils.text import slugify
1919
from django.utils.translation import gettext_lazy as _
2020
from django_slack import slack_message
21-
from simple_history.utils import update_change_reason
2221

2322
from config.celery_app import app
2423

@@ -886,9 +885,10 @@ def notify_of_completed_flights():
886885
flight.save()
887886

888887
# Store the change reason in the history
889-
update_change_reason(
890-
flight, f"Hard stopped with ${value_remaining} value remaining."
891-
)
888+
# See: https://github.com/jazzband/django-simple-history/issues/1181
889+
# update_change_reason(
890+
# flight, f"Hard stopped with ${value_remaining} value remaining."
891+
# )
892892

893893
completed_flights_by_advertiser[flight.campaign.advertiser.slug].append(
894894
flight

0 commit comments

Comments
 (0)