From d4589e607deef878f65152b397d650dc71d590df Mon Sep 17 00:00:00 2001 From: Katherine Date: Thu, 4 Sep 2025 20:48:42 -0400 Subject: [PATCH 1/3] Update explanation of order in modules.html --- esp/templates/program/modules/admincore/modules.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esp/templates/program/modules/admincore/modules.html b/esp/templates/program/modules/admincore/modules.html index add9704b5e..183a1a11db 100644 --- a/esp/templates/program/modules/admincore/modules.html +++ b/esp/templates/program/modules/admincore/modules.html @@ -34,7 +34,7 @@

Module Management for {{ program.niceName }}

  • The Availability Module must always be required
  • Acknowledgment Modules must always be required
  • The Two Phase Lottery Module must always be required
  • -
  • The Credit Card Module must always be last and cannot be required
  • +
  • The Credit Card Module must always come after everything except the Confirm module and cannot be required
  • The Confirm Registration Module cannot be required
  • @@ -127,4 +127,4 @@

    {% include "program/modules/admincore/returnlink.html" %} -{% endblock %} \ No newline at end of file +{% endblock %} From 15e594f43b6c36bceb7e4bfa41b4996d3da74cae Mon Sep 17 00:00:00 2001 From: Katherine Date: Thu, 4 Sep 2025 21:03:13 -0400 Subject: [PATCH 2/3] Force confirm reg to be last --- esp/esp/program/modules/handlers/admincore.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/esp/esp/program/modules/handlers/admincore.py b/esp/esp/program/modules/handlers/admincore.py index a7089e7be0..2fe8e2a197 100644 --- a/esp/esp/program/modules/handlers/admincore.py +++ b/esp/esp/program/modules/handlers/admincore.py @@ -574,15 +574,16 @@ def modules(self, request, tl, one, two, module, extra, prog): pmo.seq = 0 pmo.required = True pmo.save() - # Credit card modules should never be required and always last + # Credit card modules should never be required and always be after everything except confirm reg pmos = ProgramModuleObj.objects.filter(program = prog, module__handler__contains = "CreditCardModule_") for pmo in pmos: pmo.seq = 10000 pmo.required = False pmo.save() - # The confirm reg module should never be required + # The confirm reg module should never be required and should always be last pmos = ProgramModuleObj.objects.filter(program = prog, module__handler = "StudentRegConfirm") for pmo in pmos: + pmo.seq = 99999 pmo.required = False pmo.save() # The availability module should always be required From 4c0485cc0b91b416cf60c60a9e1b3060096e685f Mon Sep 17 00:00:00 2001 From: Katherine Date: Thu, 4 Sep 2025 21:09:20 -0400 Subject: [PATCH 3/3] Fix capitalization --- esp/templates/program/modules/admincore/modules.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esp/templates/program/modules/admincore/modules.html b/esp/templates/program/modules/admincore/modules.html index 183a1a11db..6bfe1da7b1 100644 --- a/esp/templates/program/modules/admincore/modules.html +++ b/esp/templates/program/modules/admincore/modules.html @@ -34,7 +34,7 @@

    Module Management for {{ program.niceName }}

  • The Availability Module must always be required
  • Acknowledgment Modules must always be required
  • The Two Phase Lottery Module must always be required
  • -
  • The Credit Card Module must always come after everything except the Confirm module and cannot be required
  • +
  • The Credit Card Module must always come after everything except the Confirm Registration Module and cannot be required
  • The Confirm Registration Module cannot be required