hot fix language form (#8940)

fossasia · Jul 8, 2023 · 076c3c6 · 076c3c6 · vercel · Jul 8, 2023
1 parent dc2f6bd
commit 076c3c6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/app/components/forms/orders/attendee-list.js b/app/components/forms/orders/attendee-list.js
@@ -26,6 +26,12 @@ export default class AttendeeList extends Component {
       if (attendee.fluent_language) {
         this.languageFormMapCodeToName(attendee, 'fluent_language', languageForms2);
       }
+      if (attendee.language_form_1) {
+        this.languageFormMapCodeToName(attendee, 'language_form_1', languageForms1);
+      }
+      if (attendee.language_form_2) {
+        this.languageFormMapCodeToName(attendee, 'language_form_2', languageForms2);
+      }
       if (attendee.gender) {
         this.genderAddSpaces(attendee);
       }

diff --git a/app/templates/components/forms/orders/attendee-list.hbs b/app/templates/components/forms/orders/attendee-list.hbs
@@ -54,7 +54,7 @@
                     {{else if (eq field.type 'select')}}
                       <span class="word-break">{{get holder field.identifierPath}}</span>
                     {{else if (eq field.type 'checkbox')}}
-                      {{#if (or (eq field.fieldIdentifier "native_language") (eq field.fieldIdentifier "fluent_language") (eq field.fieldIdentifier "gender"))}}
+                      {{#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"))}}
                         <span class="word-break">{{get holder (concat field.fieldIdentifier '_name_mapping')}}</span>
                       {{else}}
                         <span class="word-break">

diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs
@@ -240,7 +240,9 @@
                     @onChange={{action (mut (get holder field.identifierPath))}} />
                     <span>{{t 'I want to receive email updates about future Wikimania editions.'}} </span>
                 {{else if (eq field.type 'checkbox')}}
-                  {{#if (and (not-eq field.fieldIdentifier "language_form_1") (not-eq field.fieldIdentifier "language_form_2"))}}
+                  {{#if 
+                    (and (not-eq field.fieldIdentifier "native_language") (and (not-eq field.fieldIdentifier "fluent_language")
+                    (and (not-eq field.fieldIdentifier "language_form_1") (not-eq field.fieldIdentifier "language_form_2"))))}}
                     <UiCheckbox
                       @checked={{get holder field.identifierPath}}         
                       @name={{if field.isRequired (concat field.fieldIdentifier "_required_" index) (concat field.fieldIdentifier "_" index)}}       
@@ -268,15 +270,15 @@
                     </div>
                   </UiDropdown>
                 {{/if}}
-                {{#if (eq field.fieldIdentifier "language_form_1")}}
+                {{#if (or (eq field.fieldIdentifier "language_form_1") (eq field.fieldIdentifier "native_language"))}}
                   <Widgets::Forms::UiCheckboxGroup 
                     @options={{languageForms1}}
                     @onChange={{action "updateLanguageFormsSelection"}}
                     @holder={{holder}}
                     @field={{field}}
                   />
                 {{/if}}
-                {{#if (eq field.fieldIdentifier "language_form_2")}}
+                {{#if (or (eq field.fieldIdentifier "language_form_2") (eq field.fieldIdentifier "fluent_language"))}}
                   <Widgets::Forms::UiCheckboxGroup 
                     @options={{languageForms2}}
                     @onChange={{action "updateLanguageFormsSelection"}}