Skip to content

Commit bf1e448

Browse files
committed
Merged in [7561] from rjsparks@nostrum.com:
Updates and bugfixes to the agenda editing features * Removes the pattern of using ScheduledSession m2m objects with one of the relationships left as None * Improves scheduled session state handling * Simplifies sending email to scheduled session requestors * Improved timeslot purpose and room editing * Improved access controls to editing forms * Better test coverage for the meeting views * Improvements to the javascript driven by prototyping automated tests * Better initialization of a new meeting On the session request form: - Allows specifiying room resources (projectors, meetecho) - Allows specifying what people must be present On the schedule editing page: - correctly calculates conflict levels - displays conflicts in and out of each session separately - italicizes BoFs - shows resource and people conflicts Adds automated placement as a management command - Legacy-Id: 7628 Note: SVN reference [7561] has been migrated to Git commit 1221f79
2 parents 826ca3b + 1221f79 commit bf1e448

87 files changed

Lines changed: 12351 additions & 1384 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ietf/group/models.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ def has_role(self, user, role_names):
6262
role_names = [role_names]
6363
return user.is_authenticated() and self.role_set.filter(name__in=role_names, person__user=user).exists()
6464

65+
def is_bof(self):
66+
return (self.state.slug in ["bof", "bof-conc"])
67+
6568
def get_chair(self):
6669
chair = self.role_set.filter(name__slug='chair')[:1]
6770
return chair and chair[0] or None
@@ -135,10 +138,10 @@ class GroupMilestoneInfo(models.Model):
135138
docs = models.ManyToManyField('doc.Document', blank=True)
136139

137140
def __unicode__(self):
138-
return self.desc[:20] + "..."
141+
return self.desc[:20] + "..."
139142
class Meta:
140143
abstract = True
141-
ordering = ['due', 'id']
144+
ordering = ['due', 'id']
142145

143146
class GroupMilestone(GroupMilestoneInfo):
144147
time = models.DateTimeField(auto_now=True)
@@ -155,14 +158,15 @@ class GroupStateTransitions(models.Model):
155158
next_states = models.ManyToManyField('doc.State', related_name='previous_groupstatetransitions_states')
156159

157160
def __unicode__(self):
158-
return u'%s "%s" -> %s' % (self.group.acronym, self.state.name, [s.name for s in self.next_states.all()])
161+
return u'%s "%s" -> %s' % (self.group.acronym, self.state.name, [s.name for s in self.next_states.all()])
159162

160163
GROUP_EVENT_CHOICES = [
161164
("changed_state", "Changed state"),
162165
("added_comment", "Added comment"),
163166
("info_changed", "Changed metadata"),
164167
("requested_close", "Requested closing group"),
165168
("changed_milestone", "Changed milestone"),
169+
("sent_notification", "Sent notification")
166170
]
167171

168172
class GroupEvent(models.Model):

0 commit comments

Comments
 (0)