Skip to content

Commit 227f83b

Browse files
committed
Changed the autogeneration of schedule names to use slugified user (person) name, rather than login. Logins are mostly email addresses, and may contain characters not permitted in the URL pattern for schedule names, and are less readable in the contexts where schedule names are used.
- Legacy-Id: 18567
1 parent 9b6c573 commit 227f83b

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

ietf/secr/meetings/tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def test_add_meeting(self):
9292
new_meeting = Meeting.objects.get(number=number)
9393

9494
self.assertTrue(new_meeting.schedule)
95-
self.assertEqual(new_meeting.schedule.name, 'secretary1')
95+
self.assertEqual(new_meeting.schedule.name, 'sec-retary-1')
9696
self.assertTrue(new_meeting.schedule.base)
9797
self.assertEqual(new_meeting.schedule.base.name, 'base')
9898
self.assertEqual(new_meeting.attendees, None)

ietf/secr/meetings/views.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from django.db.models import Max
1111
from django.forms.models import inlineformset_factory
1212
from django.shortcuts import render, get_object_or_404, redirect
13+
from django.utils.text import slugify
1314

1415
import debug # pyflakes:ignore
1516

@@ -227,7 +228,7 @@ def add(request):
227228
)
228229

229230
schedule = Schedule.objects.create(meeting = meeting,
230-
name = "{}1".format(request.user.username),
231+
name = "%s-1" % slugify(request.user.person.plain_name()),
231232
owner = request.user.person,
232233
visible = True,
233234
public = True,

ietf/secr/templates/meetings/view.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ <h2>IETF {{ meeting.number }} - View</h2>
4848
</select>
4949
</form>
5050
</li>
51+
{% if meeting.schedule %}
5152
<li><button onclick="window.location='{% url "ietf.secr.meetings.views.rooms" meeting_id=meeting.number schedule_name=meeting.schedule.name %}'">Official Schedule</button></li>
53+
{% endif %}
5254
</ul>
5355
</div> <!-- button-group -->
5456

0 commit comments

Comments
 (0)