Merged in [19238] from jennifer@painless-security.com:

Find AD conflicts using AD person pk instead of role pk. Fixes #3354.
 - Legacy-Id: 19239
Note: SVN reference [19238] has been migrated to Git commit 73e0120eac
This commit is contained in:
Robert Sparks 2021-07-16 15:55:22 +00:00
commit d577abf41e

View file

@ -546,7 +546,7 @@ class Session(object):
self.session_pk = session_db.pk
self.group = session_db.group.acronym
self.parent = session_db.group.parent.acronym if session_db.group.parent else None
self.ad = session_db.group.ad_role().pk if session_db.group.ad_role() else None
self.ad = session_db.group.ad_role().person.pk if session_db.group.ad_role() else None
self.is_area_meeting = any([
session_db.group.type_id == 'area',
session_db.group.type_id == 'ag',