Remove proxy layer from liaisons tool, do some minor cleanups of

duplicated code, make sure the custom form widgets escape their input.

There's still a bit of custom proxying going on in the IETFHM class
hierarchy.
 - Legacy-Id: 6794

Author: OleLaursen

ietf/liaisons/__init__.py

@@ -2,7 +2,7 @@
 # coding: latin-1
 
 from types import ModuleType
-import urls, models, views, forms, accounts, admin, utils, widgets, decorators, sitemaps, feeds
+import urls, models, views, forms, admin, utils, widgets, sitemaps, feeds
 
 # These people will be sent a stack trace if there's an uncaught exception in
 # code any of the modules imported above:

ietf/liaisons/accounts.py

@@ -1,63 +1,78 @@
-from django.conf import settings
+from ietf.person.models import Person
+from ietf.group.models import Role
+from ietf.utils.proxy import proxy_personify_role
 
-from ietf.idtracker.models import Role, PersonOrOrgInfo
-
-
-LIAISON_EDIT_GROUPS = ['Secretariat']
+LIAISON_EDIT_GROUPS = ['Secretariat'] # this is not working anymore, refers to old auth model
 
 
 def get_ietf_chair():
-    person = PersonOrOrgInfo.objects.filter(role=Role.IETF_CHAIR)
-    return person and person[0] or None
+    try:
+        return proxy_personify_role(Role.objects.get(name="chair", group__acronym="ietf"))
+    except Role.DoesNotExist:
+        return None
 
 
 def get_iesg_chair():
     return get_ietf_chair()
 
 
 def get_iab_chair():
-    person = PersonOrOrgInfo.objects.filter(role=Role.IAB_CHAIR)
-    return person and person[0] or None
+    try:
+        return proxy_personify_role(Role.objects.get(name="chair", group__acronym="iab"))
+    except Role.DoesNotExist:
+        return None
+
+
+def get_irtf_chair():
+    try:
+        return proxy_personify_role(Role.objects.get(name="chair", group__acronym="irtf"))
+    except Role.DoesNotExist:
+        return None
 
 
 def get_iab_executive_director():
-    person = PersonOrOrgInfo.objects.filter(role=Role.IAB_EXCUTIVE_DIRECTOR)
-    return person and person[0] or None
+    try:
+        return proxy_personify_role(Role.objects.get(name="execdir", group__acronym="iab"))
+    except Person.DoesNotExist:
+        return None
 
 
 def get_person_for_user(user):
+    if not user.is_authenticated():
+        return None
     try:
-        return user.get_profile().person()
-    except:
+        p = user.get_profile()
+        p.email = lambda: (p.plain_name(), p.email_address())
+        return p
+    except Person.DoesNotExist:
         return None
 
-
 def is_areadirector(person):
-    return bool(person.areadirector_set.all())
+    return bool(Role.objects.filter(person=person, name="ad", group__state="active", group__type="area"))
 
 
 def is_wgchair(person):
-    return bool(person.wgchair_set.all())
+    return bool(Role.objects.filter(person=person, name="chair", group__state="active", group__type="wg"))
 
 
 def is_wgsecretary(person):
-    return bool(person.wgsecretary_set.all())
-
-
-def has_role(person, role):
-    return bool(person.role_set.filter(pk=role))
+    return bool(Role.objects.filter(person=person, name="sec", group__state="active", group__type="wg"))
 
 
 def is_ietfchair(person):
-    return has_role(person, Role.IETF_CHAIR)
+    return bool(Role.objects.filter(person=person, name="chair", group__acronym="ietf"))
 
 
 def is_iabchair(person):
-    return has_role(person, Role.IAB_CHAIR)
+    return bool(Role.objects.filter(person=person, name="chair", group__acronym="iab"))
 
 
 def is_iab_executive_director(person):
-    return has_role(person, Role.IAB_EXCUTIVE_DIRECTOR)
+    return bool(Role.objects.filter(person=person, name="execdir", group__acronym="iab"))
+
+
+def is_irtfchair(person):
+    return bool(Role.objects.filter(person=person, name="chair", group__acronym="irtf"))
 
 
 def can_add_outgoing_liaison(user):
@@ -74,15 +89,17 @@ def can_add_outgoing_liaison(user):
 
 
 def is_sdo_liaison_manager(person):
-    return bool(person.liaisonmanagers_set.all())
+    return bool(Role.objects.filter(person=person, name="liaiman", group__type="sdo"))
 
 
 def is_sdo_authorized_individual(person):
-    return bool(person.sdoauthorizedindividual_set.all())
+    return bool(Role.objects.filter(person=person, name="auth", group__type="sdo"))
 
 
 def is_secretariat(user):
-    return bool(user.groups.filter(name='Secretariat'))
+    if isinstance(user, basestring):
+        return False
+    return user.is_authenticated() and bool(Role.objects.filter(person__user=user, name="secr", group__acronym="secretariat"))
 
 
 def can_add_incoming_liaison(user):
@@ -102,36 +119,14 @@ def can_add_liaison(user):
 
 
 def is_sdo_manager_for_outgoing_liaison(person, liaison):
-    from ietf.liaisons.utils import IETFHM, SDOEntity
-    from ietf.liaisons.models import SDOs
-    from_entity = IETFHM.get_entity_by_key(liaison.from_raw_code)
-    sdo = None
-    if not from_entity:
-        try:
-            sdo = SDOs.objects.get(sdo_name=liaison.from_body())
-        except SDOs.DoesNotExist:
-            pass
-    elif isinstance(from_entity, SDOEntity):
-        sdo = from_entity.obj
-    if sdo:
-        return bool(sdo.liaisonmanagers_set.filter(person=person))
+    if liaison.from_group and liaison.from_group.type_id == "sdo":
+        return bool(liaison.from_group.role_set.filter(name="liaiman", person=person))
     return False
 
 
 def is_sdo_manager_for_incoming_liaison(person, liaison):
-    from ietf.liaisons.utils import IETFHM, SDOEntity
-    from ietf.liaisons.models import SDOs
-    to_entity = IETFHM.get_entity_by_key(liaison.to_raw_code)
-    sdo = None
-    if not to_entity:
-        try:
-            sdo = SDOs.objects.get(sdo_name=liaison.to_body)
-        except SDOs.DoesNotExist:
-            pass
-    elif isinstance(to_entity, SDOEntity):
-        sdo = to_entity.obj
-    if sdo:
-        return bool(sdo.liaisonmanagers_set.filter(person=person))
+    if liaison.to_group and liaison.to_group.type_id == "sdo":
+        return bool(liaison.to_group.role_set.filter(name="liaiman", person=person))
     return False
 
 
@@ -143,6 +138,3 @@ def can_edit_liaison(user, liaison):
         return (is_sdo_manager_for_outgoing_liaison(person, liaison) or
                 is_sdo_manager_for_incoming_liaison(person, liaison))
     return False
-
-if settings.USE_DB_REDESIGN_PROXY_CLASSES:
-    from accountsREDESIGN import * 

ietf/liaisons/accountsREDESIGN.py

@@ -8,10 +8,3 @@ class LiaisonStatementAdmin(admin.ModelAdmin):
     ordering = ('title', )
     raw_id_fields = ('from_contact', 'related_to', 'from_group', 'to_group', 'attachments')
 admin.site.register(LiaisonStatement, LiaisonStatementAdmin)
-
-class LiaisonDetailAdmin(admin.ModelAdmin):
-    list_display = ['pk', 'title', 'from_id', 'to_body', 'submitted_date', 'purpose', 'related_to' ]
-    list_display_links = ['pk', 'title']
-    ordering = ('title', )
-admin.site.register(LiaisonDetail, LiaisonDetailAdmin)
-