Skip to content

Commit fe99b75

Browse files
committed
placeholder to get main in
1 parent 6b04b78 commit fe99b75

File tree

8 files changed

+20
-10
lines changed

8 files changed

+20
-10
lines changed

.idea/magfest.iml

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

celerybeat-schedule

56 KB
Binary file not shown.

docker-compose.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,19 @@ services:
3838
command: ['celery-worker']
3939
db:
4040
image: postgres
41+
ports:
42+
- 25432:5432
4143
environment:
4244
- POSTGRES_PASSWORD=uber_db
4345
- POSTGRES_USER=uber_db
4446
- POSTGRES_DB=uber_db
47+
volumes:
48+
- ./db/uber_data:/var/lib/postgres/data
4549
redis:
4650
image: redis
4751
rabbitmq:
4852
ports:
49-
- "5672"
53+
- 25672:5672
5054
image: rabbitmq:alpine
5155
environment:
5256
- RABBITMQ_DEFAULT_USER=celery

uber/templates/forms/attendee/personal_info.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
#}
1717
<div x-data="{
1818
international: {{ personal_info.international.data | javascript_bool }},
19+
dealer: {{ (is_prereg_dealer or attendee.is_dealer) | javascript_bool }},
20+
noCellphone: {{ personal_info.no_cellphone.data | javascript_bool }},
1921
copyAddress: false,
20-
get isZipRequired(){ return !this.international && !this.copyAddress && !this.badge_placeholder }, //hmd todo broken and not sure why.
21-
canRequireCellphone: {{ (is_prereg_dealer or attendee.is_dealer) | javascript_bool }},
2222
copyCellphone: false,
23-
noCellphone: {{ personal_info.no_cellphone.data | javascript_bool }},
23+
get isZipRequired(){ return !this.international && !this.copyAddress && !this.badge_placeholder }, //hmd todo broken and not sure why.
2424
get isCellphoneDisabled() { return this.noCellphone || this.copyCellphone},
25-
get isCellphoneRequired() { return (this.staffing || this.canRequireCellPhone) && !this.noCellphone && !this.copyCellphone && !this.badge_placeholder } //badge_placeholder comes from x-data above, can be undefined.
25+
get isCellphoneRequired() { return (this.staffing || this.dealer) && !this.noCellphone && !this.copyCellphone && !this.badge_placeholder } //this is also similarly broken.
2626
}">
2727
{% block name %}
2828
{% set attendee_last_name = attendee.last_name[0] ~ '.' if limited_read else attendee.last_name %}

uber/templates/forms/macros.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@
195195
{% for key in kwargs %} {{ key }}="{{ kwargs[key] }}"{% endfor %}>
196196
<span class="form-label">{{ label_text }}</span>
197197
{% if required_if is not none %}
198+
<span>HMD Debug <span x-text="{{ required_if | string }}"></span></span>
198199
<span class="required-indicator text-danger" x-show="{{ required_if }}"> *</span>
199200
{% endif %}
200201
</label>

uber/templates/registration/attendee_data.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
{% endif %}
131131

132132
{{ form_macros.form_validation('attendee_form', '../registration/validate_attendee', callback="updateAttendee(submit_button_name)") }}
133-
<form novalidate method="post" action="../registration/update_attendee" id="attendee_form" x-data="{badge_placeholder:false, staffing: false}">
133+
<form novalidate method="post" action="../registration/update_attendee" id="attendee_form" x-data="{badge_placeholder: {{ attendee.placeholder | javascript_bool }}, staffing: {{ attendee.staffing | javascript_bool }}}">
134134
{{ csrf_token() }}
135135
<input type="hidden" name="id" value="{{ attendee.db_id }}" />
136136
{% include "forms/attendee/admin_badge_flags.html" %}

uber/templates/registration/form.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ <h4>{{ attendee.full_name }} currently owes <strong>{{ (receipt.current_amount_o
143143

144144
{{ form_macros.form_validation('attendee-form') }}
145145

146-
<form novalidate method="post" id="attendee-form" action="form" x-data="{badge_placeholder:false, staffing: {{ attendee.staffing | string | lower }}}">
146+
<form novalidate method="post" id="attendee-form" action="form" x-data="{badge_placeholder: {{ attendee.placeholder | javascript_bool }}, staffing: {{ attendee.staffing | javascript_bool }}}">
147147
{{ csrf_token() }}
148148
<input type="hidden" name="id" value="{{ attendee.db_id }}" />
149149
<input type="hidden" name="return_to" value="{{ return_to }}" />

0 commit comments

Comments
 (0)