diff --git a/client/agenda/AgendaScheduleList.vue b/client/agenda/AgendaScheduleList.vue index 87982ee62..a42315fc4 100644 --- a/client/agenda/AgendaScheduleList.vue +++ b/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`, diff --git a/ietf/ipr/factories.py b/ietf/ipr/factories.py index e32090a36..5e948e010 100644 --- a/ietf/ipr/factories.py +++ b/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): diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 9415be9bc..9989713c4 100644 --- a/ietf/meeting/views.py +++ b/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, diff --git a/ietf/secr/areas/views.py b/ietf/secr/areas/views.py index 93e438cf8..9d016699c 100644 --- a/ietf/secr/areas/views.py +++ b/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() diff --git a/ietf/secr/templates/areas/people.html b/ietf/secr/templates/areas/people.html index 7eeb77c59..8f9b18436 100644 --- a/ietf/secr/templates/areas/people.html +++ b/ietf/secr/templates/areas/people.html @@ -27,9 +27,9 @@