Skip to content

Commit 076c3c6

Browse files
author
Hieu Lam - TMA
authored
hot fix language form (#8940)
1 parent dc2f6bd commit 076c3c6

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

app/components/forms/orders/attendee-list.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ export default class AttendeeList extends Component {
2626
if (attendee.fluent_language) {
2727
this.languageFormMapCodeToName(attendee, 'fluent_language', languageForms2);
2828
}
29+
if (attendee.language_form_1) {
30+
this.languageFormMapCodeToName(attendee, 'language_form_1', languageForms1);
31+
}
32+
if (attendee.language_form_2) {
33+
this.languageFormMapCodeToName(attendee, 'language_form_2', languageForms2);
34+
}
2935
if (attendee.gender) {
3036
this.genderAddSpaces(attendee);
3137
}

app/templates/components/forms/orders/attendee-list.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
{{else if (eq field.type 'select')}}
5555
<span class="word-break">{{get holder field.identifierPath}}</span>
5656
{{else if (eq field.type 'checkbox')}}
57-
{{#if (or (eq field.fieldIdentifier "native_language") (eq field.fieldIdentifier "fluent_language") (eq field.fieldIdentifier "gender"))}}
57+
{{#if (or (eq field.fieldIdentifier "native_language") (eq field.fieldIdentifier "fluent_language") (eq field.fieldIdentifier "language_form_1") (eq field.fieldIdentifier "language_form_2") (eq field.fieldIdentifier "gender"))}}
5858
<span class="word-break">{{get holder (concat field.fieldIdentifier '_name_mapping')}}</span>
5959
{{else}}
6060
<span class="word-break">

app/templates/components/forms/orders/order-form.hbs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,9 @@
240240
@onChange={{action (mut (get holder field.identifierPath))}} />
241241
<span>{{t 'I want to receive email updates about future Wikimania editions.'}} </span>
242242
{{else if (eq field.type 'checkbox')}}
243-
{{#if (and (not-eq field.fieldIdentifier "language_form_1") (not-eq field.fieldIdentifier "language_form_2"))}}
243+
{{#if
244+
(and (not-eq field.fieldIdentifier "native_language") (and (not-eq field.fieldIdentifier "fluent_language")
245+
(and (not-eq field.fieldIdentifier "language_form_1") (not-eq field.fieldIdentifier "language_form_2"))))}}
244246
<UiCheckbox
245247
@checked={{get holder field.identifierPath}}
246248
@name={{if field.isRequired (concat field.fieldIdentifier "_required_" index) (concat field.fieldIdentifier "_" index)}}
@@ -268,15 +270,15 @@
268270
</div>
269271
</UiDropdown>
270272
{{/if}}
271-
{{#if (eq field.fieldIdentifier "language_form_1")}}
273+
{{#if (or (eq field.fieldIdentifier "language_form_1") (eq field.fieldIdentifier "native_language"))}}
272274
<Widgets::Forms::UiCheckboxGroup
273275
@options={{languageForms1}}
274276
@onChange={{action "updateLanguageFormsSelection"}}
275277
@holder={{holder}}
276278
@field={{field}}
277279
/>
278280
{{/if}}
279-
{{#if (eq field.fieldIdentifier "language_form_2")}}
281+
{{#if (or (eq field.fieldIdentifier "language_form_2") (eq field.fieldIdentifier "fluent_language"))}}
280282
<Widgets::Forms::UiCheckboxGroup
281283
@options={{languageForms2}}
282284
@onChange={{action "updateLanguageFormsSelection"}}

0 commit comments

Comments
 (0)