From 09ededc113ab258a5fa2cae2321edb34ea416d64 Mon Sep 17 00:00:00 2001
From: y-van-z <y-van-z@users.noreply.github.com>
Date: Sun, 19 Feb 2017 20:23:47 +0100
Subject: [PATCH 1/3] MBS-9219: Fix editing known languages field

In user profile editing form, template for adding a known language
caused to systematically save an unwanted `[Multiple languages]`
additional entry.

This is solved by moving the template out of the <form> element.
---
 root/account/edit.tt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/root/account/edit.tt b/root/account/edit.tt
index 7b037624aef..47c55d230a3 100644
--- a/root/account/edit.tt
+++ b/root/account/edit.tt
@@ -77,6 +77,8 @@
 
       <script>//<![CDATA[
       $(function () {
+          $(document.body).append( $('#add-language-template') );
+
           var languageCount = $('li.language').size();
 
           $('#edit-profile-form').on('click', 'button.remove', function (event) {

From 500377f303cb95d7981b4020533783c084e700f2 Mon Sep 17 00:00:00 2001
From: y-van-z <y-van-z@users.noreply.github.com>
Date: Sun, 19 Feb 2017 20:23:48 +0100
Subject: [PATCH 2/3] =?UTF-8?q?Clean=20up=20known=20language=20field?=
 =?UTF-8?q?=E2=80=99s=20editing=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Properly number and replace `id` and `name` template properties for
added known languages in user profile editing form.
---
 root/account/edit.tt | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/root/account/edit.tt b/root/account/edit.tt
index 47c55d230a3..297a9ec3b5d 100644
--- a/root/account/edit.tt
+++ b/root/account/edit.tt
@@ -65,8 +65,8 @@
             </span>
             [% extra_field = form.field('languages').field(form.field('languages').add_extra(1) - 1) %]
             <span id="add-language-template" style="display: none">
-              [% r.select(extra_field.field('language_id'), id => 'fluency-template', class => 'language_id',) %]
-              [% r.select(extra_field.field('fluency'), class => 'fluency') %]
+              [% r.select(extra_field.field('language_id'), id => 'id-language-id-template', class => 'language_id', name => 'language-id-template') %]
+              [% r.select(extra_field.field('fluency'), id => 'id-fluency-template', class => 'fluency', name => 'fluency-template') %]
               <span class="buttons inline">
                 <button type="button" class="remove negative">[% l('Remove') %]</button>
               </span>
@@ -89,15 +89,19 @@
           $('button.another').click(function (event) {
               event.preventDefault();
 
-              languageCount++;
-
               var newLanguage = $('<li>').append($('#add-language-template').clone().contents());
+              newLanguage.find('select.language_id').attr('id',
+                                                          'id-profile.languages.' + languageCount + '.language_id');
               newLanguage.find('select.language_id').attr('name',
                                                           'profile.languages.' + languageCount + '.language_id');
+              newLanguage.find('select.fluency').attr('id',
+                                                      'id-profile.languages.' + languageCount + '.fluency');
               newLanguage.find('select.fluency').attr('name',
                                                       'profile.languages.' + languageCount + '.fluency');
 
               $(this).parents('li').before(newLanguage);
+
+              languageCount++;
           });
       });
       //]]></script>

From 547b27e529989a708b1e61616f40fde7bc6736b3 Mon Sep 17 00:00:00 2001
From: y-van-z <y-van-z@users.noreply.github.com>
Date: Mon, 20 Feb 2017 18:45:07 +0100
Subject: [PATCH 3/3] =?UTF-8?q?Clean=20up=20known=20language=20field?=
 =?UTF-8?q?=E2=80=99s=20editing=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Remove unused `id` and `name` attributes from template `<select>`
- Set `name` attribute only to added language input
---
 root/account/edit.tt | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/root/account/edit.tt b/root/account/edit.tt
index 297a9ec3b5d..e4f311694cf 100644
--- a/root/account/edit.tt
+++ b/root/account/edit.tt
@@ -65,8 +65,8 @@
             </span>
             [% extra_field = form.field('languages').field(form.field('languages').add_extra(1) - 1) %]
             <span id="add-language-template" style="display: none">
-              [% r.select(extra_field.field('language_id'), id => 'id-language-id-template', class => 'language_id', name => 'language-id-template') %]
-              [% r.select(extra_field.field('fluency'), id => 'id-fluency-template', class => 'fluency', name => 'fluency-template') %]
+              [% r.select(extra_field.field('language_id'), class => 'language_id') %]
+              [% r.select(extra_field.field('fluency'), class => 'fluency') %]
               <span class="buttons inline">
                 <button type="button" class="remove negative">[% l('Remove') %]</button>
               </span>
@@ -78,6 +78,7 @@
       <script>//<![CDATA[
       $(function () {
           $(document.body).append( $('#add-language-template') );
+          $('#add-language-template').children().removeAttr('id').removeAttr('name');
 
           var languageCount = $('li.language').size();
 
@@ -90,12 +91,8 @@
               event.preventDefault();
 
               var newLanguage = $('<li>').append($('#add-language-template').clone().contents());
-              newLanguage.find('select.language_id').attr('id',
-                                                          'id-profile.languages.' + languageCount + '.language_id');
               newLanguage.find('select.language_id').attr('name',
                                                           'profile.languages.' + languageCount + '.language_id');
-              newLanguage.find('select.fluency').attr('id',
-                                                      'id-profile.languages.' + languageCount + '.fluency');
               newLanguage.find('select.fluency').attr('name',
                                                       'profile.languages.' + languageCount + '.fluency');