File tree Expand file tree Collapse file tree 3 files changed +12
-4
lines changed
templates/components/forms/orders Expand file tree Collapse file tree 3 files changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -26,6 +26,12 @@ export default class AttendeeList extends Component {
26
26
if ( attendee . fluent_language ) {
27
27
this . languageFormMapCodeToName ( attendee , 'fluent_language' , languageForms2 ) ;
28
28
}
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
+ }
29
35
if ( attendee . gender ) {
30
36
this . genderAddSpaces ( attendee ) ;
31
37
}
Original file line number Diff line number Diff line change 54
54
{{ else if (eq field.type 'select')}}
55
55
<span class =" word-break" >{{ get holder field.identifierPath }} </span >
56
56
{{ 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" ))}}
58
58
<span class =" word-break" >{{ get holder (concat field.fieldIdentifier ' _name_mapping' )}} </span >
59
59
{{ else }}
60
60
<span class =" word-break" >
Original file line number Diff line number Diff line change 240
240
@onChange ={{ action (mut (get holder field.identifierPath ))}} />
241
241
<span >{{ t ' I want to receive email updates about future Wikimania editions.' }} </span >
242
242
{{ 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" ))))}}
244
246
<UiCheckbox
245
247
@checked ={{ get holder field.identifierPath }}
246
248
@name ={{ if field.isRequired (concat field.fieldIdentifier " _required_" index ) (concat field.fieldIdentifier " _" index )}}
268
270
</div >
269
271
</UiDropdown >
270
272
{{ /if }}
271
- {{ #if (eq field.fieldIdentifier " language_form_1" )}}
273
+ {{ #if (or ( eq field.fieldIdentifier " language_form_1" ) ( eq field.fieldIdentifier " native_language " ) )}}
272
274
<Widgets::Forms::UiCheckboxGroup
273
275
@options ={{ languageForms1 }}
274
276
@onChange ={{ action " updateLanguageFormsSelection" }}
275
277
@holder ={{ holder }}
276
278
@field ={{ field }}
277
279
/>
278
280
{{ /if }}
279
- {{ #if (eq field.fieldIdentifier " language_form_2" )}}
281
+ {{ #if (or ( eq field.fieldIdentifier " language_form_2" ) ( eq field.fieldIdentifier " fluent_language " ) )}}
280
282
<Widgets::Forms::UiCheckboxGroup
281
283
@options ={{ languageForms2 }}
282
284
@onChange ={{ action " updateLanguageFormsSelection" }}
You can’t perform that action at this time.
0 commit comments