Merge branch 'dev' into 'master'

Dev

See merge request !114

portal/listeners.py

@@ -7,6 +7,7 @@ from django.db.models.signals import post_delete, post_save
 from django.dispatch import receiver
 from django_auth_ldap.backend import LDAPBackend, populate_user
 from social_django.models import UserSocialAuth
+from django.conf import settings
 
 from .models import Lab, Profile, ShareGroup
 
@@ -42,6 +43,12 @@ def user_login(sender, user, **kwargs):
                 user.profile.labs.add(*Lab.objects.filter(ldap__in=user.ldap_user.group_names))
             elif azuread_groups:
                 user.profile.labs.add(*Lab.objects.filter(ldap__in=azuread_groups))
+                if settings.AUTH_LDAP_STAFF_GROUP in azuread_groups:
+                    user.is_staff = True
+                else:
+                    user.is_staff = False
+
+                user.save()
 
         user.profile.save()
 

portal/templates/portal/secure/user/base.html

@@ -29,7 +29,7 @@
         </span>
 
     </a>
-    <div class="collapse subnav {% if active_page == 'datafiles' or active_page == 'datasets' or active_page == 'shared-datafiles' or active_page == 'sharegroups' or active_page == 'dashboard' or active_page == 'api' %}show{% endif %}" id="file-subnav">
+    <div class="collapse subnav {% if active_page == 'datafiles' or active_page == 'datasets' or active_page == 'shared-datafiles' or active_page == 'sharegroups' or active_page == 'api' %}show{% endif %}" id="file-subnav">
         <a class="nav-link {% if active_page == 'datafiles' %}active{% endif %}" href="{% url 'user.datafiles' %}">
             <i class="fas fa-file-alt fa-fw fa-lg"></i>
             {% trans 'My Files' %}