Merge remote-tracking branch 'origin/main' into feat/postgres

client/agenda/AgendaScheduleList.vue

@@ -270,7 +270,9 @@ const meetingEvents = computed(() => {
 
     // -> Populate event links
     const links = []
-    if (item.flags.showAgenda || ['regular', 'plenary'].includes(item.type)) {
+    const typesWithLinks = ['regular', 'plenary', 'other']
+    const purposesWithoutLinks = ['admin', 'closed_meeting', 'officehours', 'social']
+    if (item.flags.showAgenda || (typesWithLinks.includes(item.type) && !purposesWithoutLinks.includes(item.purpose))) {
       if (item.flags.agenda) {
         links.push({
           id: `lnk-${item.id}-tar`,

ietf/ipr/factories.py

@@ -4,6 +4,7 @@
 
 import datetime
 import factory
+from faker import Faker
 
 from django.utils import timezone
 
@@ -13,12 +14,13 @@ from ietf.ipr.models import (
 )
 
 def _fake_patent_info():
+    fake = Faker()
     return "Date: %s\nNotes: %s\nTitle: %s\nNumber: %s\nInventor: %s\n" % (
         (timezone.now()-datetime.timedelta(days=365)).strftime("%Y-%m-%d"),
-        factory.Faker('paragraph'),
-        factory.Faker('sentence', nb_words=8),
+        fake.paragraph(),
+        fake.sentence(nb_words=8),
         'US9999999',
-        factory.Faker('name'),
+        fake.name(),
     )
 
 class IprDisclosureBaseFactory(factory.django.DjangoModelFactory):

ietf/meeting/views.py

@@ -1708,6 +1708,7 @@ def agenda_extract_schedule (item):
         "startDateTime": item.timeslot.time.isoformat(),
         "status": item.session.current_status,
         "type": item.session.type.slug,
+        "purpose": item.session.purpose.slug,
         "isBoF": item.session.group_at_the_time().state_id == "bof",
         "filterKeywords": item.filter_keywords,
         "groupAcronym": item.session.group_at_the_time().acronym,

ietf/secr/areas/views.py

@@ -1,7 +1,7 @@
 import json
  
 from django.contrib import messages
-from django.http import HttpResponse
+from django.http import HttpResponse, HttpResponseBadRequest
 from django.shortcuts import render, get_object_or_404, redirect
 
 from ietf.group.models import Group, GroupEvent, Role
@@ -110,6 +110,8 @@ def people(request, name):
 
                 messages.success(request, 'New Area Director added successfully!')
                 return redirect('ietf.secr.areas.views.view', name=name)
+        else:
+            return HttpResponseBadRequest('Invalid action')
     else:
         form = AreaDirectorForm()
 

ietf/secr/templates/areas/people.html

@@ -27,9 +27,9 @@
                         <td>{% if director.name.slug == "ad" %}
                             Voting Enabled
                         {% else %}
-                            <button type="submit" name="submit">Enable Voting</button></td>
+                            <button type="submit" name="submit" value="Enable Voting">Enable Voting</button></td>
                         {% endif %}
-                            <td><button type="submit" name="submit">Retire</button></td>
+                            <td><button type="submit" name="submit" value="Retire">Retire</button></td>
                         </tr>
                     </form>
             {% endfor %}
@@ -45,7 +45,7 @@
                         {{ form.as_table }}
                         <tr>
                             <td></td>
-                            <td><button type="submit" name="submit">Add</button></td>
+                            <td><button type="submit" name="submit" value="Add">Add</button></td>
                         </tr>
                         </tbody>
                     </table>

playwright/tests/meeting/agenda.spec.js

@@ -268,7 +268,7 @@ test.describe('past - desktop', () => {
         }
         // Scheduled
         case 'sched': {
-          if (event.flags.showAgenda || ['regular', 'plenary'].includes(event.type)) {
+          if (event.flags.showAgenda || (['regular', 'plenary', 'other'].includes(event.type) && !['admin', 'closed_meeting', 'officehours', 'social'].includes(event.purpose))) {
             const eventButtons = row.locator('.agenda-table-cell-links > .agenda-table-cell-links-buttons')
             if (event.flags.agenda) {
               // Show meeting materials button
@@ -1145,7 +1145,7 @@ test.describe('future - desktop', () => {
       // -----------------------
       if (event.status === 'sched') {
         const eventButtons = row.locator('.agenda-table-cell-links > .agenda-table-cell-links-buttons')
-        if (event.flags.showAgenda || ['regular', 'plenary'].includes(event.type)) {
+        if (event.flags.showAgenda || (['regular', 'plenary', 'other'].includes(event.type) && !['admin', 'closed_meeting', 'officehours', 'social'].includes(event.purpose))) {
           if (event.flags.agenda) {
             // Show meeting materials button
             await expect(eventButtons.locator('i.bi.bi-collection')).toBeVisible()