Merged in [16668] from sasha@dashcare.nl:

Fix #2560 - Sort names in history when changing list of members.
 - Legacy-Id: 16789
Note: SVN reference [16668] has been migrated to Git commit de9cde9e43
This commit is contained in:
Henrik Levkowetz 2019-10-01 10:15:46 +00:00
commit 12bf466832

View file

@ -955,8 +955,8 @@ def edit(request, group_type=None, acronym=None, action="edit", field=None):
old = Email.objects.filter(role__group=group, role__name=slug).select_related("person")
if set(new) != set(old):
changes.append((attr, new, desc(title,
", ".join(x.get_name() for x in new),
", ".join(x.get_name() for x in old))))
", ".join(sorted(x.get_name() for x in new)),
", ".join(sorted(x.get_name() for x in old)))))
group.role_set.filter(name=slug).delete()
for e in new:
Role.objects.get_or_create(name_id=slug, email=e, group=group, person=e.person)