Skip to content

Preserve sponsorship renewal on approval forms #3097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nice6042 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Preserve sponsorship renewal on approval forms #3097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions apps/sponsors/tests/test_views_admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,9 @@ def setUp(self):
}

def test_display_confirmation_form_on_get(self):
self.sponsorship.renewal = True
self.sponsorship.save(update_fields=["renewal"])

response = self.client.get(self.url)
context = response.context
form = context["form"]
Expand All @@ -315,6 +318,7 @@ def test_display_confirmation_form_on_get(self):
self.assertEqual(form.initial["start_date"], self.sponsorship.start_date)
self.assertEqual(form.initial["end_date"], self.sponsorship.end_date)
self.assertEqual(form.initial["sponsorship_fee"], self.sponsorship.sponsorship_fee)
self.assertTrue(form.initial["renewal"])
self.assertNotEqual(self.sponsorship.status, Sponsorship.APPROVED) # did not update

def test_approve_sponsorship_on_post(self):
Expand Down Expand Up @@ -405,6 +409,9 @@ def setUp(self):
}

def test_display_confirmation_form_on_get(self):
self.sponsorship.renewal = True
self.sponsorship.save(update_fields=["renewal"])

response = self.client.get(self.url)
context = response.context
form = context["form"]
Expand All @@ -417,6 +424,7 @@ def test_display_confirmation_form_on_get(self):
self.assertEqual(form.initial["start_date"], self.sponsorship.start_date)
self.assertEqual(form.initial["end_date"], self.sponsorship.end_date)
self.assertEqual(form.initial["sponsorship_fee"], self.sponsorship.sponsorship_fee)
self.assertTrue(form.initial["renewal"])
self.assertNotEqual(self.sponsorship.status, Sponsorship.APPROVED) # did not update

def test_approve_sponsorship_and_execute_contract_on_post(self):
Expand Down
2 changes: 2 additions & 0 deletions apps/sponsors/views_admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ def approve_sponsorship_view(model_admin, request, pk):
"start_date": sponsorship.start_date,
"end_date": sponsorship.end_date,
"sponsorship_fee": sponsorship.sponsorship_fee,
"renewal": sponsorship.renewal,
}

form = SponsorshipReviewAdminForm(initial=initial, force_required=True)
Expand Down Expand Up @@ -119,6 +120,7 @@ def approve_signed_sponsorship_view(model_admin, request, pk):
"start_date": sponsorship.start_date,
"end_date": sponsorship.end_date,
"sponsorship_fee": sponsorship.sponsorship_fee,
"renewal": sponsorship.renewal,
}

form = SignedSponsorshipReviewAdminForm(initial=initial, force_required=True)
Expand Down