fix: Prevent ADs and chairs from added to bethere constraint

Fixes ietf-tools#5163 and ietf-tools#3890

ietf/secr/sreq/forms.py

@@ -235,6 +235,13 @@ def clean_joint_with_groups(self):
     def clean_comments(self):
         return clean_text_field(self.cleaned_data['comments'])
 
+    def clean_bethere(self):
+        extra = set(Person.objects.filter(role__group=self.group, role__name__in=['chair','ad']) & self.cleaned_data['bethere'])
+        if extra:
+            extras = ", ".join(e.name for e in extra)
+            raise forms.ValidationError(f"Please remove the following persons, the system tracks their availability due to their roles: {extras}.")
+        return True
+
     def clean_send_notifications(self):
         return True if not self.notifications_optional else self.cleaned_data['send_notifications']
 

ietf/secr/templates/includes/sessions_request_form.html

@@ -33,7 +33,7 @@
                 {{ form.bethere.errors }}
                 {{ form.bethere }}
                 <p class="fw-bold text-danger">
-                    You should not include the Area Directors; they will be added automatically.
+                    Do not include Area Directors and WG Chairs; the system already tracks their availability.
                 </p>
             </td>
         </tr>

ietf/static/js/session_details_form.js

@@ -55,9 +55,9 @@
 
     function update_name_field_visibility(name_elts, purpose) {
         if (!purpose || purpose === 'regular') {
-            name_elts.forEach(e => e.closest('.form-group').classList.add('hidden'));
+            name_elts.forEach(e => e.closest('.form-group') ? e.closest('.form-group').classList.add('hidden') : null);
         } else {
-            name_elts.forEach(e => e.closest('.form-group').classList.remove('hidden'));
+            name_elts.forEach(e => e.closest('.form-group') ? e.closest('.form-group').classList.remove('hidden') : null);
         }
     }
 
@@ -113,4 +113,4 @@
         }
     }
     window.addEventListener('load', on_load, false);
-})();
+})();