Fix some problems with liaison importer and related models, add a

test, port account management and related utilities, fix up proxy and
port most of the views and form code
 - Legacy-Id: 3345

Author: OleLaursen

ietf/idrfc/testsREDESIGN.py

@@ -42,10 +42,10 @@
 from pyquery import PyQuery
 
 from ietf.idtracker.models import IDDates
-from doc.models import *
-from name.models import *
-from group.models import *
-from person.models import *
+from redesign.doc.models import *
+from redesign.name.models import *
+from redesign.group.models import *
+from redesign.person.models import *
 from ietf.iesg.models import TelechatDates
 from ietf.utils.test_utils import SimpleUrlTestCase, RealDatabaseTest, login_testing_unauthorized
 from ietf.utils.test_runner import mail_outbox

ietf/liaisons/accountsREDESIGN.py

@@ -2,7 +2,7 @@
 from redesign.group.models import Role
 
 
-LIAISON_EDIT_GROUPS = ['Secretariat']
+LIAISON_EDIT_GROUPS = ['Secretariat'] # this is not working anymore, refers to old auth model
 
 
 def get_ietf_chair():
@@ -31,7 +31,10 @@ def get_iab_executive_director():
 
 
 def get_person_for_user(user):
-    return user.get_profile()
+    p = user.get_profile()
+    p.email = lambda: (p.name, p.email_address().address)
+
+    return p
 
 
 def is_areadirector(person):
@@ -80,7 +83,7 @@ def is_sdo_authorized_individual(person):
 
 
 def is_secretariat(user):
-    return bool(Role.objects.filter(email__person=user.get_profile(), name="auth", group__acronym="secretariat"))
+    return bool(Role.objects.filter(email__person=user.get_profile(), name="secr", group__acronym="secretariat"))
 
 
 def can_add_incoming_liaison(user):

ietf/liaisons/admin.py

@@ -33,7 +33,6 @@ class LiaisonDetailAdmin(admin.ModelAdmin):
 if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
     admin.site.register(LiaisonDetail, LiaisonDetailAdmin)
 
-
 class LiaisonPurposeAdmin(admin.ModelAdmin):
     ordering = ('purpose_text', )
 if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
@@ -138,3 +137,13 @@ class LegacyLiaisonUserAdmin(admin.ModelAdmin):
     list_display = ['pk', 'person_link', 'login_name', 'user_level', 'comment', ]
     raw_id_fields = [ 'person', ]
 admin.site.register(LegacyLiaisonUser, LegacyLiaisonUserAdmin)
+
+class LiaisonStatementAdmin(admin.ModelAdmin):
+    list_display = ['id', 'title', 'from_name', 'to_name', 'submitted', 'purpose', 'related_to']
+    list_display_links = ['id', 'title']
+    ordering = ('title', )
+    raw_id_fields = ('from_contact', 'related_to', 'from_group', 'to_group', 'attachments')
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    from ietf.liaisons.models import LiaisonStatement
+    admin.site.register(LiaisonStatement, LiaisonStatementAdmin)
+

ietf/liaisons/forms.py

@@ -425,3 +425,6 @@ def liaison_form_factory(request, **kwargs):
     elif can_add_incoming_liaison(user):
         return IncomingLiaisonForm(user, **kwargs)
     return None
+
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    from ietf.liaisons.formsREDESIGN import *