implemented suggestions

Author: Saksham-Sirohi

app/eventyay/base/models/event.py

@@ -83,6 +83,7 @@ def default_roles():
     attendee = [
         Permission.EVENT_VIEW,
         Permission.EVENT_EXHIBITION_CONTACT,
+        Permission.EVENT_CHAT_DIRECT,
     ]
     viewer = attendee + [Permission.ROOM_VIEW, Permission.ROOM_CHAT_READ]
     participant = viewer + [
@@ -1526,6 +1527,13 @@ def get_all_permissions(self, user):
         event_trait_grants = self._get_trait_grants_with_defaults()
         event_roles = self.roles if self.roles is not None else default_roles()
 
+        # Track if user has any organizer/admin role
+        has_organizer_role = False
+        organizer_roles = {'admin', 'apiuser', 'scheduleuser', 'video_stage_manager', 
+                           'video_channel_manager', 'video_announcement_manager', 
+                           'video_user_viewer', 'video_user_moderator', 'video_room_manager',
+                           'video_kiosk_manager', 'video_config_manager'}
+        
         for role, required_traits in event_trait_grants.items():
             if (
                 isinstance(required_traits, list)
@@ -1535,18 +1543,25 @@ def get_all_permissions(self, user):
                 )
                 and (required_traits or allow_empty_traits)
             ):
-                role_perms = event_roles.get(role, SYSTEM_ROLES.get(role, []))
-                
-                direct_messaging_def = VIDEO_PERMISSION_BY_FIELD.get('can_video_direct_message')
-                if direct_messaging_def and role != 'video_direct_messaging':
-                    direct_messaging_trait = direct_messaging_def.trait_value(self.slug)
-                    has_direct_messaging_trait = direct_messaging_trait in user.traits
-                    
-                    if not has_direct_messaging_trait:
-                        direct_message_value = Permission.EVENT_CHAT_DIRECT.value
-                        role_perms = [p for p in role_perms if (p if isinstance(p, str) else p.value) != direct_message_value]
+                if role in organizer_roles:
+                    has_organizer_role = True
 
+                role_perms = event_roles.get(role, SYSTEM_ROLES.get(role, []))
                 result[self].update(role_perms)
+        
+        # If user has organizer/admin role but doesn't have direct messaging trait, remove EVENT_CHAT_DIRECT
+        # This ensures organizers only get direct messaging if explicitly granted via team permissions
+        # Attendees (without organizer roles) always keep EVENT_CHAT_DIRECT
+        if has_organizer_role:
+            direct_messaging_def = VIDEO_PERMISSION_BY_FIELD.get('can_video_direct_message')
+            if direct_messaging_def:
+                direct_messaging_trait = direct_messaging_def.trait_value(self.slug)
+                traits = user.traits or []
+                has_direct_messaging_trait = direct_messaging_trait in traits
+                
+                if not has_direct_messaging_trait:
+                    direct_message_value = Permission.EVENT_CHAT_DIRECT.value
+                    result[self] = {p for p in result[self] if (p if isinstance(p, str) else p.value) != direct_message_value}
 
         for room in self.rooms.all():
             room_trait_grants = room.trait_grants if room.trait_grants is not None else {}

app/eventyay/base/models/world.py

@@ -33,6 +33,7 @@ def default_roles():
     attendee = [
         Permission.EVENT_VIEW,
         Permission.EVENT_EXHIBITION_CONTACT,
+        Permission.EVENT_CHAT_DIRECT,
     ]
     viewer = attendee + [Permission.ROOM_VIEW, Permission.ROOM_CHAT_READ]
     participant = viewer + [

app/eventyay/eventyay_common/templates/eventyay_common/organizers/edit.html

@@ -9,18 +9,18 @@
     <h1 class="page-header">{{ organizer.name }}</h1>
     <ul class="nav nav-tabs" role="tablist">
         <li role="presentation" class="{% if active_section == 'general' %}active{% endif %}">
-            <a href="#general" aria-controls="general" role="tab" data-toggle="tab">
+            <a href="#" data-target="#general" aria-controls="general" role="tab" data-toggle="tab">
                 {% translate "General" %}
             </a>
         </li>
         {% if can_manage_teams %}
         <li role="presentation" class="{% if active_section == 'teams' %}active{% endif %}">
-            <a href="#teams" aria-controls="teams" role="tab" data-toggle="tab">
+            <a href="#" data-target="#teams" aria-controls="teams" role="tab" data-toggle="tab">
                 {% translate "Create Team" %}
             </a>
         </li>
         <li role="presentation" class="{% if active_section == 'permissions' %}active{% endif %}">
-            <a href="#permissions" aria-controls="permissions" role="tab" data-toggle="tab">
+            <a href="#" data-target="#permissions" aria-controls="permissions" role="tab" data-toggle="tab">
                 {% translate "Manage Team Permissions" %}
             </a>
         </li>

app/eventyay/eventyay_common/video/permissions.py

@@ -63,8 +63,7 @@ def collect_user_video_traits(event_slug: str, team_permission_set: Iterable[str
     """
     traits = []
     for perm_name in team_permission_set:
-        definition = VIDEO_PERMISSION_BY_FIELD.get(perm_name)
-        if definition:
+        if definition := VIDEO_PERMISSION_BY_FIELD.get(perm_name):
             traits.append(definition.trait_value(event_slug))
     return traits