Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions esp/esp/program/modules/handlers/admincore.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions esp/templates/program/modules/admincore/modules.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ <h1>Module Management for {{ program.niceName }}</h1>
<li>The Availability Module must always be required</li>
<li>Acknowledgment Modules must always be required</li>
<li>The Two Phase Lottery Module must always be required</li>
<li>The Credit Card Module must always be last <i>and</i> cannot be required</li>
<li>The Credit Card Module must always come after everything except the Confirm Registration Module <i>and</i> cannot be required</li>
<li>The Confirm Registration Module cannot be required</li>
</ul>
</div>
Expand Down Expand Up @@ -127,4 +127,4 @@ <h3>

{% include "program/modules/admincore/returnlink.html" %}

{% endblock %}
{% endblock %}
Loading