diff --git a/client/agenda/AgendaScheduleList.vue b/client/agenda/AgendaScheduleList.vue index 57940e63d..87982ee62 100644 --- a/client/agenda/AgendaScheduleList.vue +++ b/client/agenda/AgendaScheduleList.vue @@ -293,7 +293,7 @@ const meetingEvents = computed(() => { color: 'red' }) } - if (agendaStore.useHedgeDoc) { + if (agendaStore.useNotes) { links.push({ id: `lnk-${item.id}-note`, label: 'Notepad for note-takers', diff --git a/client/agenda/store.js b/client/agenda/store.js index 788ed05dd..839d464c4 100644 --- a/client/agenda/store.js +++ b/client/agenda/store.js @@ -50,7 +50,7 @@ export const useAgendaStore = defineStore('agenda', { selectedCatSubs: [], settingsShown: false, timezone: DateTime.local().zoneName, - useHedgeDoc: false, + useNotes: false, visibleDays: [] }), getters: { @@ -160,7 +160,7 @@ export const useAgendaStore = defineStore('agenda', { this.isCurrentMeeting = agendaData.isCurrentMeeting this.meeting = agendaData.meeting this.schedule = agendaData.schedule - this.useHedgeDoc = agendaData.useHedgeDoc + this.useNotes = agendaData.useNotes // -> Compute current info note hash this.infoNoteHash = murmur(agendaData.meeting.infoNote, 0).toString() diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py index 386451c34..1a544713c 100644 --- a/ietf/meeting/models.py +++ b/ietf/meeting/models.py @@ -405,6 +405,9 @@ class Meeting(models.Model): def previous_meeting(self): return Meeting.objects.filter(type_id=self.type_id,date__lt=self.date).order_by('-date').first() + def uses_notes(self): + return self.date>=datetime.date(2020,7,6) + class Meta: ordering = ["-date", "-id"] indexes = [ diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index ab2272117..9ecdc2c93 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -215,7 +215,7 @@ class MeetingTests(BaseMeetingTestCase): }, "categories": rjson.get("categories"), # Just expect the value to exist "isCurrentMeeting": True, - "useHedgeDoc": True, + "useNotes": True, "schedule": rjson.get("schedule"), # Just expect the value to exist "floors": [] } diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 16443dab4..0c5838f72 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -1579,7 +1579,7 @@ def agenda_plain(request, num=None, name=None, base=None, ext=None, owner=None, "now": timezone.now().astimezone(meeting.tz()), "display_timezone": display_timezone, "is_current_meeting": is_current_meeting, - "use_codimd": True if meeting.date>=settings.MEETING_USES_CODIMD_DATE else False, + "use_notes": meeting.uses_notes(), "cache_time": 150 if is_current_meeting else 3600, }, content_type=mimetype[ext], @@ -1654,7 +1654,7 @@ def api_get_agenda_data (request, num=None): }, "categories": filter_organizer.get_filter_categories(), "isCurrentMeeting": is_current_meeting, - "useHedgeDoc": True if meeting.date>=settings.MEETING_USES_CODIMD_DATE else False, + "useNotes": meeting.uses_notes(), "schedule": list(map(agenda_extract_schedule, filtered_assignments)), "floors": list(map(agenda_extract_floorplan, floors)) }) @@ -2365,7 +2365,7 @@ def session_details(request, num, acronym): 'can_view_request': can_view_request, 'thisweek': datetime_today()-datetime.timedelta(days=7), 'now': timezone.now(), - 'use_codimd': True if meeting.date>=settings.MEETING_USES_CODIMD_DATE else False, + 'use_notes': meeting.uses_notes(), }) class SessionDraftsForm(forms.Form): @@ -3528,7 +3528,6 @@ def upcoming(request): 'menu_entries': menu_entries, 'selected_menu_entry': selected_menu_entry, 'now': timezone.now(), - 'use_codimd': (date_today() >= settings.MEETING_USES_CODIMD_DATE), }) diff --git a/ietf/settings.py b/ietf/settings.py index 81139222d..609cb3877 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -972,8 +972,6 @@ INTERNET_DRAFT_DAYS_TO_EXPIRE = 185 FLOORPLAN_MEDIA_DIR = 'floor' FLOORPLAN_DIR = os.path.join(MEDIA_ROOT, FLOORPLAN_MEDIA_DIR) - -MEETING_USES_CODIMD_DATE = datetime.date(2020,7,6) MEETING_LEGACY_OFFICE_HOURS_END = 112 # last meeting to use legacy office hours representation # Maximum dimensions to accept at all diff --git a/ietf/templates/meeting/interim_session_buttons.html b/ietf/templates/meeting/interim_session_buttons.html index 3378d743b..c4096430b 100644 --- a/ietf/templates/meeting/interim_session_buttons.html +++ b/ietf/templates/meeting/interim_session_buttons.html @@ -31,8 +31,8 @@ {% endif %} - {# etherpad #} - {% if use_codimd %} + {# notes #} + {% if use_notes %} Cancelled {% else %} -