@@ -64,38 +64,33 @@ def cleanup_view(self, request):
6464
6565 CleanupForm = get_cleanup_form (self .model ._meta )
6666
67- # show form or confirmation
68- if request .method == "POST" :
69- form = CleanupForm (request .POST )
70- if form .is_valid ():
71- days_to_keep = form .cleaned_data ["days_to_keep" ]
72- cutoff_date = timezone .now () - datetime .timedelta (days = days_to_keep )
73- events_to_delete = EventLog .objects .filter (received_at__lte = cutoff_date )
74- delete_count = events_to_delete .count ()
75-
76- context = {
77- ** self .admin_site .each_context (request ),
78- "title" : f"Confirm { self .model ._meta .verbose_name } deletion" ,
79- "days_to_keep" : days_to_keep ,
80- "delete_count" : delete_count ,
81- "cutoff_date" : cutoff_date ,
82- "opts" : self .model ._meta ,
83- "object_name" : self .model ._meta .verbose_name ,
84- "model_count" : [
85- (self .model ._meta .verbose_name_plural , delete_count )
86- ]
87- if delete_count
88- else [],
89- "perms_lacking" : None ,
90- "protected" : None ,
91- }
92- return render (
93- request ,
94- "admin/django_github_app/eventlog/cleanup_confirmation.html" ,
95- context ,
96- )
97-
98- form = CleanupForm ()
67+ form = CleanupForm (request .POST or None )
68+
69+ if form .is_valid ():
70+ days_to_keep = form .cleaned_data ["days_to_keep" ]
71+ cutoff_date = timezone .now () - datetime .timedelta (days = days_to_keep )
72+ events_to_delete = EventLog .objects .filter (received_at__lte = cutoff_date )
73+ delete_count = events_to_delete .count ()
74+
75+ context = {
76+ ** self .admin_site .each_context (request ),
77+ "title" : f"Confirm { self .model ._meta .verbose_name } deletion" ,
78+ "days_to_keep" : days_to_keep ,
79+ "delete_count" : delete_count ,
80+ "cutoff_date" : cutoff_date ,
81+ "opts" : self .model ._meta ,
82+ "object_name" : self .model ._meta .verbose_name ,
83+ "model_count" : [(self .model ._meta .verbose_name_plural , delete_count )]
84+ if delete_count
85+ else [],
86+ "perms_lacking" : None ,
87+ "protected" : None ,
88+ }
89+ return render (
90+ request ,
91+ "admin/django_github_app/eventlog/cleanup_confirmation.html" ,
92+ context ,
93+ )
9994
10095 context = {
10196 ** self .admin_site .each_context (request ),
0 commit comments