Skip to content

Commit 7c00ccc

Browse files
authored
Update credit card vs confirm reg order (#3897)
* Update explanation of order in modules.html * Force confirm reg to be last * Fix capitalization
1 parent aa4b151 commit 7c00ccc

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

esp/esp/program/modules/handlers/admincore.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -574,15 +574,16 @@ def modules(self, request, tl, one, two, module, extra, prog):
574574
pmo.seq = 0
575575
pmo.required = True
576576
pmo.save()
577-
# Credit card modules should never be required and always last
577+
# Credit card modules should never be required and always be after everything except confirm reg
578578
pmos = ProgramModuleObj.objects.filter(program = prog, module__handler__contains = "CreditCardModule_")
579579
for pmo in pmos:
580580
pmo.seq = 10000
581581
pmo.required = False
582582
pmo.save()
583-
# The confirm reg module should never be required
583+
# The confirm reg module should never be required and should always be last
584584
pmos = ProgramModuleObj.objects.filter(program = prog, module__handler = "StudentRegConfirm")
585585
for pmo in pmos:
586+
pmo.seq = 99999
586587
pmo.required = False
587588
pmo.save()
588589
# The availability module should always be required

esp/templates/program/modules/admincore/modules.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h1>Module Management for {{ program.niceName }}</h1>
3434
<li>The Availability Module must always be required</li>
3535
<li>Acknowledgment Modules must always be required</li>
3636
<li>The Two Phase Lottery Module must always be required</li>
37-
<li>The Credit Card Module must always be last <i>and</i> cannot be required</li>
37+
<li>The Credit Card Module must always come after everything except the Confirm Registration Module <i>and</i> cannot be required</li>
3838
<li>The Confirm Registration Module cannot be required</li>
3939
</ul>
4040
</div>
@@ -127,4 +127,4 @@ <h3>
127127

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

130-
{% endblock %}
130+
{% endblock %}

0 commit comments

Comments
 (0)