Skip to content

Commit 57d8ffb

Browse files
author
Sasha Romijn
committed
Re-introduce Group.meeting_seen_as_area and use it in automatic scheduler
- Legacy-Id: 17901
1 parent 468afdc commit 57d8ffb

3 files changed

Lines changed: 40 additions & 4 deletions

File tree

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Copyright The IETF Trust 2020', 'All Rights Reserved
2+
# -*- coding: utf-8 -*-
3+
# Generated by Django 1.11.27 on 2020-02-12 07:11
4+
from __future__ import unicode_literals
5+
6+
from django.db import migrations, models
7+
8+
9+
def forward(apps, schema_editor):
10+
Group = apps.get_model('group', 'Group')
11+
initial_area_groups = ['dispatch', 'gendispatch', 'intarea', 'opsarea', 'opsawg', 'rtgarea', 'rtgwg', 'saag', 'secdispatch', 'tsvarea', 'irtfopen']
12+
Group.objects.filter(acronym__in=initial_area_groups).update(meeting_seen_as_area=True)
13+
14+
15+
def reverse(apps, schema_editor):
16+
pass
17+
18+
19+
class Migration(migrations.Migration):
20+
21+
dependencies = [
22+
('group', '0023_use_milestone_dates_default_to_true'),
23+
]
24+
25+
operations = [
26+
migrations.AddField(
27+
model_name='group',
28+
name='meeting_seen_as_area',
29+
field=models.BooleanField(default=False, help_text='For meeting scheduling, should be considered an area meeting, even if the type is WG'),
30+
),
31+
migrations.AddField(
32+
model_name='grouphistory',
33+
name='meeting_seen_as_area',
34+
field=models.BooleanField(default=False, help_text='For meeting scheduling, should be considered an area meeting, even if the type is WG'),
35+
),
36+
migrations.RunPython(forward, reverse),
37+
]

ietf/group/models.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ class GroupInfo(models.Model):
3939
list_subscribe = models.CharField(max_length=255, blank=True)
4040
list_archive = models.CharField(max_length=255, blank=True)
4141
comments = models.TextField(blank=True)
42-
42+
meeting_seen_as_area = models.BooleanField(default=False, help_text='For meeting scheduling, should be considered an area meeting, even if the type is WG')
43+
4344
unused_states = models.ManyToManyField('doc.State', help_text="Document states that have been disabled for the group.", blank=True)
4445
unused_tags = models.ManyToManyField(DocTagName, help_text="Document tags that have been disabled for the group.", blank=True)
4546

ietf/meeting/management/commands/schedule_generator.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,9 +462,7 @@ def __init__(self, stdout, meeting, session_db, business_constraint_costs, verbo
462462
self.is_area_meeting = any([
463463
session_db.group.type_id == 'area',
464464
session_db.group.type_id == 'ag',
465-
self.group in ['dispatch', 'gendispatch', 'intarea', 'opsarea/opsawg', 'rtgarea',
466-
'rtgwg', 'saag', 'secdispatch', 'tsvarea', 'irtfopen']
467-
# meeting_seen_as_area TODO
465+
session_db.group.meeting_seen_as_area,
468466
])
469467
self.is_bof = session_db.group.state_id == 'bof'
470468
self.is_prg = session_db.group.type_id == 'rg' and session_db.group.state_id == 'proposed'

0 commit comments

Comments
 (0)