monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Choice and TextChoice options crashing WebHost if the option's default value is "random" (#3458)

This commit is contained in:
Chris Wilson 2024-06-08 04:54:14 -04:00 committed by GitHub
parent b3a2473853
commit 39deef5d09
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
WebHostLib/templates/weightedOptions/macros.html
View File

@ -18,7 +18,11 @@
<tbody> <tbody>
{% for id, name in option.name_lookup.items() %} {% for id, name in option.name_lookup.items() %}
{% if name != 'random' %} {% if name != 'random' %}
{{ RangeRow(option_name, option, option.get_option_name(id), name, False, name if option.get_option_name(option.default)|lower == name|lower else None) }} {% if option.default != 'random' %}
{{ RangeRow(option_name, option, option.get_option_name(id), name, False, name if option.get_option_name(option.default)|lower == name else None) }}
{% else %}
{{ RangeRow(option_name, option, option.get_option_name(id), name) }}
{% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{{ RandomRow(option_name, option) }} {{ RandomRow(option_name, option) }}
@ -92,7 +96,11 @@
<tbody> <tbody>
{% for id, name in option.name_lookup.items() %} {% for id, name in option.name_lookup.items() %}
{% if name != 'random' %} {% if name != 'random' %}
{% if option.default != 'random' %}
{{ RangeRow(option_name, option, option.get_option_name(id), name, False, name if option.get_option_name(option.default)|lower == name else None) }} {{ RangeRow(option_name, option, option.get_option_name(id), name, False, name if option.get_option_name(option.default)|lower == name else None) }}
{% else %}
{{ RangeRow(option_name, option, option.get_option_name(id), name) }}
{% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{{ RandomRow(option_name, option) }} {{ RandomRow(option_name, option) }}