Merge pull request #4166 from magfest/fix-magdev1244

Stop waitlisting panels with confirmed POC
magfest · Jul 7, 2023 · f5fb779 · f5fb779
2 parents 669f46f + f59da8e
commit f5fb779
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/uber/automated_emails.py b/uber/automated_emails.py
@@ -1172,8 +1172,7 @@ def __init__(self, subject, template, filter, ident, **kwargs):
         'panels/panel_accept_reminder.txt',
         lambda app: (
             c.PANELS_CONFIRM_DEADLINE
-            and app.status == c.ACCEPTED
-            and not app.confirmed
+            and app.confirm_deadline
             and (localized_now() + timedelta(days=2)) > app.confirm_deadline),
         ident='panel_accept_reminder')
 

diff --git a/uber/configspec.ini b/uber/configspec.ini
@@ -676,7 +676,7 @@ expected_response = string(default='')
 
 # Panelists have a certain number of days after their acceptance to confirm they will run their panel.
 # Their custom confirmation deadline is calculated using this config option.
-panels_confirm_deadline = integer(default=14)
+panels_confirm_deadline = integer(default=0)
 
 # While true, the schedule is not visible to non-admins.  This is a bool and not
 # a date because we've never really been able to predict when the schedule will

diff --git a/uber/models/panels.py b/uber/models/panels.py
@@ -160,7 +160,7 @@ def unmatched_applicants(self):
 
     @property
     def confirm_deadline(self):
-        if self.accepted and c.PANELS_CONFIRM_DEADLINE:
+        if c.PANELS_CONFIRM_DEADLINE and self.has_been_accepted and not self.confirmed and not self.poc_id:
             confirm_deadline = timedelta(days=c.PANELS_CONFIRM_DEADLINE)
             return self.accepted + confirm_deadline