From 476a4e6d3e025d1b8260e358f00ba4ffec8d1c61 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Thu, 22 Dec 2022 18:34:14 +0100
Subject: Profile: force refresh for session external - minor fix on UI

---
 ishtar_common/templates/ishtar/forms/profile.html | 8 ++++----
 ishtar_common/templatetags/ishtar_helpers.py      | 7 ++++---
 ishtar_common/views.py                            | 2 ++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ishtar_common/templates/ishtar/forms/profile.html b/ishtar_common/templates/ishtar/forms/profile.html
index 926f035e2..795ab6ab1 100644
--- a/ishtar_common/templates/ishtar/forms/profile.html
+++ b/ishtar_common/templates/ishtar/forms/profile.html
@@ -1,5 +1,5 @@
 {% extends "ishtar/form.html" %}
-{% load i18n inline_formset table_form %}
+{% load i18n inline_formset table_form ishtar_helpers %}
 {% block extra_head %}
 <script type='text/javascript'>
 var base_profile_url = "{% url 'profile' %}";
@@ -33,9 +33,9 @@ $(document).ready(function(){
     <div class="form-row">
         {% for field in form.visible_fields %}
         {% if forloop.counter0 == 0 %}
-        <div class="form-group col-lg-12">
-            {{field|safe}}
-        </div>
+        <div class="form-group col-12"><div class="col-lg-6">
+            {{field|bs_field|safe}}
+        </div></div>
     </div>
     <div class="form-row">
         {% elif field.name == 'delete_profile' %}
diff --git a/ishtar_common/templatetags/ishtar_helpers.py b/ishtar_common/templatetags/ishtar_helpers.py
index 2189ea1eb..a6be65b84 100644
--- a/ishtar_common/templatetags/ishtar_helpers.py
+++ b/ishtar_common/templatetags/ishtar_helpers.py
@@ -11,11 +11,12 @@ register = Library()
 @register.filter
 def bs_field(input_field):
     input_field = str(input_field)
-    if not input_field.startswith("<input") or "form-control" in input_field:
+    if not (input_field.startswith("<input") or input_field.startswith("<select")) or \
+            "form-control" in input_field:
         return input_field
     soup = BeautifulSoup(str(input_field), "lxml")
-    for tag in ["input"]:
-        field = getattr(soup, tag)
+    for tag in ["input", "select"]:
+        field = soup.find(tag)
         if not field:
             continue
         if "class" in field.attrs.keys():
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 9e4177f45..3ae686f99 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -1129,6 +1129,8 @@ class ProfileEdit(LoginRequiredMixin, FormView):
             profile.save()
             if current_changed:
                 clean_session_cache(request.session)
+                if "EXTERNAL_SOURCES" in request.session:
+                    del request.session["EXTERNAL_SOURCES"]
         return super(ProfileEdit, self).dispatch(request, *args, **kwargs)
 
     def get_success_url(self):
-- 
cgit v1.2.3