Merge branch 'master' into...

Merge branch 'master' into 285-manage-permissions-for-persons-users-and-groups-django-groups-in-frontend

aleksis/core/static/js/main.js

@@ -63,12 +63,7 @@ $(document).ready(function () {
 
     // If JS is activated, the language form will be auto-submitted
     $('.language-field select').change(function () {
-
-        // Ugly bug fix to ensure correct value
-        const selectEl = $("select[name=language]");
-        selectEl.val(selectEl.val());
-
-        $(".language-form").submit();
+        $(this).parents(".language-form").submit();
     });
 
     // If auto-submit is activated (see above), the language submit must not be visible

aleksis/core/templates/core/partials/language_form.html

@@ -13,7 +13,7 @@
   {# Select #}
   <div class="input-field language-field">
     <span>{% trans "Language" %}</span>
-    <select name="language" id="language-select">
+    <select name="language">
       {% for language in languages %}
         <option value="{{ language.code }}" {% if language.code == LANGUAGE_CODE %}
                 selected {% endif %}>{{ language.name_local }}</option>