Merge branch 'develop' into 30107-preferences-json-update-profile

src/etools/applications/users/admin.py

@@ -116,7 +116,8 @@ class ProfileAdmin(admin.ModelAdmin):
     search_fields = (
         'tenant_profile__office__name',
         'country__name',
-        'user__email'
+        'user__email',
+        'guid'
     )
     readonly_fields = (
         'user',

src/etools/applications/users/models.py

@@ -9,6 +9,7 @@
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import connection, models
 from django.db.models.signals import post_save
+from django.urls import reverse
 from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 
@@ -105,6 +106,10 @@ def get_staff_member_country(self):
                     return country
         return None
 
+    def get_admin_url(self):
+        info = (self._meta.app_label, self._meta.model_name)
+        return reverse('admin:%s_%s_change' % info, args=(self.pk,))
+
     def save(self, *args, **kwargs):
         if self.email != self.email.lower():
             raise ValidationError("Email must be lowercase.")

src/etools/applications/users/tasks.py

@@ -20,7 +20,7 @@ class AzureUserMapper:
         'mail',
         'surname',
         'userType',
-        ('companyName', ['UNICEF', ]),
+        # ('companyName', ['UNICEF', ]),
     ]
 
     USER_ATTR_MAP = {

src/etools/templates/admin/base_site.html

@@ -150,7 +150,10 @@
             <div id="user-tools">
                 {% block welcome-msg %}
                     {% trans 'Welcome,' %}
+                <a href="{{ user.get_admin_url }}">
                     <strong>{% firstof user.get_short_name user.get_username %}</strong>.
+                </a>
+
                 {% endblock %}
                 {% block userlinks %}
                 <a href="{% url 'admin:logout' %}">{% trans 'Log out' %}</a>