User and invitation list views should show team for agent users if th…

…at feature is enabled

temba/orgs/views/views.py

@@ -373,9 +373,10 @@ def get_context_data(self, **kwargs):
             for user in context["object_list"]:
                 membership = self.request.org.get_membership(user)
                 user.role = membership.role
-                # user.team = membership.team  # TODO enable this when orgs can create teams
+                user.team = membership.team
 
             context["has_viewers"] = self.request.org.get_users(roles=[OrgRole.VIEWER]).exists()
+            context["has_teams"] = Org.FEATURE_TEAMS in self.request.org.features
             context["admin_count"] = self.request.org.get_users(roles=[OrgRole.ADMINISTRATOR]).count()
             return context
 
@@ -2152,6 +2153,7 @@ def build_context_menu(self, menu):
         def get_context_data(self, **kwargs):
             context = super().get_context_data(**kwargs)
             context["validity_days"] = settings.INVITATION_VALIDITY.days
+            context["has_teams"] = Org.FEATURE_TEAMS in self.request.org.features
             return context
 
     class Create(RequireFeatureMixin, ModalFormMixin, OrgPermsMixin, SmartCreateView):

templates/orgs/invitation_list.html

@@ -28,7 +28,7 @@
           <td>{{ obj.email }}</td>
           <td>
             {{ obj.role.display }}
-            {% if obj.team %}({{ obj.team.name }}){% endif %}
+            {% if obj.team and has_teams %}({{ obj.team.name }}){% endif %}
           </td>
           <td>{{ obj.created_on|day }}</td>
           <td class="w-10">

templates/orgs/user_list.html

@@ -34,7 +34,7 @@
           <td>{{ obj.name }}</td>
           <td>
             {{ obj.role.display }}
-            {% if obj.team %}({{ obj.team.name }}){% endif %}
+            {% if obj.team and has_teams %}({{ obj.team.name }}){% endif %}
           </td>
           <td class="w-10">
             {% if obj.role.code != "A" or admin_count > 1 %}