Add proxy for LiaisonDetail, start porting the view code utils, import various liaison roles and rename a couple of fields on LiaisonStatement to try to make them more self-explanatory

 - Legacy-Id: 3321

Author: OleLaursen

ietf/liaisons/accounts.py

@@ -1,3 +1,5 @@
+from django.conf import settings
+
 from ietf.idtracker.models import Role, PersonOrOrgInfo
 
 
@@ -141,3 +143,6 @@ 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

@@ -0,0 +1,121 @@
+from redesign.person.models import Person
+from redesign.group.models import Role
+
+
+LIAISON_EDIT_GROUPS = ['Secretariat']
+
+
+def get_ietf_chair():
+    try:
+        return Person.objects.get(email__role__name="chair", email__role__group__acronym="ietf")
+    except Person.DoesNotExist:
+        return None
+
+
+def get_iesg_chair():
+    return get_ietf_chair()
+
+
+def get_iab_chair():
+    try:
+        return Person.objects.get(email__role__name="chair", email__role__group__acronym="iab")
+    except Person.DoesNotExist:
+        return None
+
+
+def get_iab_executive_director():
+    try:
+        return Person.objects.get(email__role__name="execdir", email__role__group__acronym="iab")
+    except Person.DoesNotExist:
+        return None
+
+
+def get_person_for_user(user):
+    return user.get_profile()
+
+
+def is_areadirector(person):
+    return bool(Role.objects.filter(email__person=person, name="ad", group__state="active", group__type="area"))
+
+
+def is_wgchair(person):
+    return bool(Role.objects.filter(email__person=person, name="chair", group__state="active", group__type="wg"))
+
+
+def is_wgsecretary(person):
+    return bool(Role.objects.filter(email__person=person, name="sec", group__state="active", group__type="wg"))
+
+
+def is_ietfchair(person):
+    return bool(Role.objects.filter(email__person=person, name="chair", group__acronym="ietf"))
+
+
+def is_iabchair(person):
+    return bool(Role.objects.filter(email__person=person, name="chair", group__acronym="iab"))
+
+
+def is_iab_executive_director(person):
+    return bool(Role.objects.filter(email__person=person, name="execdir", group__acronym="iab"))
+
+
+def can_add_outgoing_liaison(user):
+    person = get_person_for_user(user)
+    if not person:
+        return False
+
+    if (is_areadirector(person) or is_wgchair(person) or
+        is_wgsecretary(person) or is_ietfchair(person) or
+        is_iabchair(person) or is_iab_executive_director(person) or
+        is_sdo_liaison_manager(person) or is_secretariat(user)):
+        return True
+    return False
+
+
+def is_sdo_liaison_manager(person):
+    return bool(Role.objects.filter(email__person=person, name="liaiman", group__type="sdo"))
+
+
+def is_sdo_authorized_individual(person):
+    return bool(Role.objects.filter(email__person=person, name="auth", group__type="sdo"))
+
+
+def is_secretariat(user):
+    return bool(Role.objects.filter(email__person=user.get_profile(), name="auth", group__acronym="secretariat"))
+
+
+def can_add_incoming_liaison(user):
+    person = get_person_for_user(user)
+    if not person:
+        return False
+
+    if (is_sdo_liaison_manager(person) or
+        is_sdo_authorized_individual(person) or
+        is_secretariat(user)):
+        return True
+    return False
+
+
+def can_add_liaison(user):
+    return can_add_incoming_liaison(user) or can_add_outgoing_liaison(user)
+
+
+def is_sdo_manager_for_outgoing_liaison(person, liaison):
+    if liaison.from_group and liaison.from_group.type_id == "sdo":
+        return bool(liaison.from_group.role_set.filter(name="liaiman", email__person=person))
+    return False
+
+
+def is_sdo_manager_for_incoming_liaison(person, liaison):
+    if liaison.to_group and liaison.to_group.type_id == "sdo":
+        return bool(liaison.to_group.role_set.filter(name="liaiman", email__person=person))
+    return False
+
+
+def can_edit_liaison(user, liaison):
+    if is_secretariat(user):
+        return True
+    person = get_person_for_user(user)
+    if is_sdo_liaison_manager(person):
+        return (is_sdo_manager_for_outgoing_liaison(person, liaison) or
+                is_sdo_manager_for_incoming_liaison(person, liaison))
+    return False

ietf/liaisons/admin.py

@@ -30,12 +30,14 @@ class LiaisonDetailAdmin(admin.ModelAdmin):
 #               'response_contact', 'technical_contact', 'purpose', 'purpose_text', 'deadline_date', 'action_taken',
 #               'related_to')
     raw_id_fields=['person', 'related_to']
-admin.site.register(LiaisonDetail, LiaisonDetailAdmin)
+if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    admin.site.register(LiaisonDetail, LiaisonDetailAdmin)
 
 
 class LiaisonPurposeAdmin(admin.ModelAdmin):
     ordering = ('purpose_text', )
-admin.site.register(LiaisonPurpose, LiaisonPurposeAdmin)
+if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    admin.site.register(LiaisonPurpose, LiaisonPurposeAdmin)
 
 
 class LiaisonManagersAdmin(admin.ModelAdmin):

ietf/liaisons/models.py

@@ -308,7 +308,8 @@ class Meta:
 
 if settings.USE_DB_REDESIGN_PROXY_CLASSES or hasattr(settings, "IMPORTING_FROM_OLD_SCHEMA"):
     from redesign.name.models import LiaisonStatementPurposeName
-    from redesign.person.models import Person
+    from redesign.doc.models import Document
+    from redesign.person.models import Email
     from redesign.group.models import Group
 
     class LiaisonStatement(models.Model):
@@ -317,13 +318,14 @@ class LiaisonStatement(models.Model):
         body = models.TextField(blank=True)
         deadline = models.DateField(null=True, blank=True)
 
-        related_to = models.ForeignKey('LiaisonDetail', blank=True, null=True)
+        related_to = models.ForeignKey('LiaisonStatement', blank=True, null=True)
 
-        from_body = models.ForeignKey(Group, related_name="liaisonstatement_from_set", null=True, blank=True, help_text="From body, if it exists")
+        from_group = models.ForeignKey(Group, related_name="liaisonstatement_from_set", null=True, blank=True, help_text="From body, if it exists")
         from_name = models.CharField(max_length=255, help_text="Name of the sender body")
-        to_body = models.ForeignKey(Group, related_name="liaisonstatement_to_set", null=True, blank=True, help_text="to body, if it exists")
+        from_contact = models.ForeignKey(Email)
+        to_group = models.ForeignKey(Group, related_name="liaisonstatement_to_set", null=True, blank=True, help_text="To body, if it exists")
         to_name = models.CharField(max_length=255, help_text="Name of the recipient body")
-        to_contact = models.CharField(blank=True, max_length=255)
+        to_contact = models.CharField(blank=True, max_length=255, help_text="Contacts at to body")
 
         reply_to = models.CharField(blank=True, max_length=255)
 
@@ -332,14 +334,26 @@ class LiaisonStatement(models.Model):
         cc = models.TextField(blank=True)
 
         submitted = models.DateTimeField(null=True, blank=True)
-        submitted_by = models.ForeignKey(Person)
         modified = models.DateTimeField(null=True, blank=True)
         approved = models.DateTimeField(null=True, blank=True)
 
         action_taken = models.BooleanField(default=False)
 
-        #submitter_name = models.CharField(blank=True, null=True, max_length=255)
-        #submitter_email = models.CharField(blank=True, null=True, max_length=255)
+        attachments = models.ManyToManyField(Document, blank=True)
 
+        def name(self):
+            from django.template.defaultfilters import slugify
+            if self.from_group:
+                frm = self.from_group.acronym or self.from_group.name
+            else:
+                frm = self.from_name
+            if self.to_group:
+                to = self.to_group.acronym or self.to_group.name
+            else:
+                to = self.to_name
+            return slugify("liaison" + " " + self.submitted.strftime("%Y-%m-%d") + " " + frm[:50] + " " + to[:50] + " " + self.title[:115])
+        
         def __unicode__(self):
             return self.title or "<no title>"
+
+        LiaisonDetailOld = LiaisonDetail

ietf/liaisons/proxy.py

@@ -0,0 +1,152 @@
+from redesign.proxy_utils import TranslatingManager
+from ietf.liaisons.models import LiaisonStatement
+
+class LiaisonDetailProxy(LiaisonStatement):
+    objects = TranslatingManager(dict(meeting_num="number"))
+                                      
+    def from_object(self, base):
+        for f in base._meta.fields:
+            setattr(self, f.name, getattr(base, f.name))
+        return self
+                
+    #detail_id = models.AutoField(primary_key=True)
+    @property
+    def detail_id(self):
+        return self.id
+    #person = models.ForeignKey(PersonOrOrgInfo, null=True, db_column='person_or_org_tag')
+    @property
+    def person(self):
+        return self.submitted_by
+    #submitted_date = models.DateField(null=True, blank=True)
+    @property
+    def submitted_date(self):
+        return self.submitted.date()
+    #last_modified_date = models.DateField(null=True, blank=True)
+    @property
+    def last_modified_date(self):
+        return self.modified.date()
+    #from_id = models.IntegerField(null=True, blank=True)
+    @property
+    def from_id(self):
+        return self.from_group_id
+    #to_body = models.CharField(blank=True, null=True, max_length=255)
+    @property
+    def to_body(self):
+        return self.to_name
+    #title = models.CharField(blank=True, null=True, max_length=255) # same name
+    #response_contact = models.CharField(blank=True, null=True, max_length=255) # same name
+    #technical_contact = models.CharField(blank=True, null=True, max_length=255) # same name
+    #purpose_text = models.TextField(blank=True, null=True, db_column='purpose')
+    @property
+    def purpose_text(self):
+        return ""
+    #body = models.TextField(blank=True,null=True) # same name
+    #deadline_date = models.DateField(null=True, blank=True)
+    @property
+    def deadline_date(self):
+        return self.deadline.date()
+    #cc1 = models.TextField(blank=True, null=True)
+    @property
+    def cc1(self):
+        return self.cc
+    #cc2 = models.CharField(blank=True, null=True, max_length=50) # unused
+    #submitter_name = models.CharField(blank=True, null=True, max_length=255)
+    #submitter_email = models.CharField(blank=True, null=True, max_length=255)
+    #by_secretariat = models.IntegerField(null=True, blank=True)
+    @property
+    def by_secretariat(self):
+        return False
+    #to_poc = models.CharField(blank=True, null=True, max_length=255)
+    @property
+    def to_poc(self):
+        return self.to_contact
+    #to_email = models.CharField(blank=True, null=True, max_length=255) # unused
+    #purpose = models.ForeignKey(LiaisonPurpose,null=True)
+    #replyto = models.CharField(blank=True, null=True, max_length=255)
+    @property
+    def replyto(self):
+        return self.reply_to
+    #from_raw_body = models.CharField(blank=True, null=True, max_length=255)
+    @property
+    def from_raw_body(self):
+        return self.from_name
+    #from_raw_code = models.CharField(blank=True, null=True, max_length=255)
+    @property
+    def from_raw_code(self):
+        return self.from_group_id
+    #to_raw_code = models.CharField(blank=True, null=True, max_length=255)
+    @property
+    def to_raw_code(self):
+        return self.to_body_id
+    #approval = models.ForeignKey(OutgoingLiaisonApproval, blank=True, null=True)
+    @property
+    def approval(self):
+        return bool(self.approved)
+    #action_taken = models.BooleanField(default=False, db_column='taken_care') # same name
+    #related_to = models.ForeignKey('LiaisonDetail', blank=True, null=True) # same name
+    def __str__(self):
+	return unicode(self)
+    def __unicode__(self):
+	return self.title or "<no title>"
+    def from_body(self):
+        return self.from_name
+    def from_sdo(self):
+        return self.from_group if self.from_group and self.from_group.type_id == "sdo" else None
+    def from_email(self):
+        self.from_contact
+    def get_absolute_url(self):
+	return '/liaison/%d/' % self.detail_id
+    class Meta:
+        proxy = True
+
+    def notify_pending_by_email(self, fake):
+        raise NotImplemented
+        from ietf.liaisons.utils import IETFHM
+
+        from_entity = IETFHM.get_entity_by_key(self.from_raw_code)
+        if not from_entity:
+            return None
+        to_email = []
+        for person in from_entity.can_approve():
+            to_email.append('%s <%s>' % person.email())
+        subject = 'New Liaison Statement, "%s" needs your approval' % (self.title)
+        from_email = settings.LIAISON_UNIVERSAL_FROM
+        body = render_to_string('liaisons/pending_liaison_mail.txt',
+                                {'liaison': self,
+                                })
+        mail = IETFEmailMessage(subject=subject,
+                                to=to_email,
+                                from_email=from_email,
+                                body = body)
+        if not fake:
+            mail.send()         
+        return mail                                                     
+
+    def send_by_email(self, fake=False):
+        raise NotImplemented
+        if self.is_pending():
+            return self.notify_pending_by_email(fake)
+        subject = 'New Liaison Statement, "%s"' % (self.title)
+        from_email = settings.LIAISON_UNIVERSAL_FROM
+        to_email = self.to_poc.split(',')
+        cc = self.cc1.split(',')
+        if self.technical_contact:
+            cc += self.technical_contact.split(',')
+        if self.response_contact:
+            cc += self.response_contact.split(',')
+        bcc = ['statements@ietf.org']
+        body = render_to_string('liaisons/liaison_mail.txt',
+                                {'liaison': self,
+                                })
+        mail = IETFEmailMessage(subject=subject,
+                                to=to_email,
+                                from_email=from_email,
+                                cc = cc,
+                                bcc = bcc,
+                                body = body)
+        if not fake:
+            mail.send()         
+        return mail                                                     
+
+    def is_pending(self):
+        return not self.approved

ietf/liaisons/utils.py

@@ -1,3 +1,5 @@
+from django.conf import settings
+
 from ietf.idtracker.models import Area, IETFWG
 from ietf.liaisons.models import SDOs, LiaisonManagers
 from ietf.liaisons.accounts import (is_ietfchair, is_iabchair, is_iab_executive_director,
@@ -420,3 +422,6 @@ def get_all_can_approve_codes(self, person):
 
 
 IETFHM = IETFHierarchyManager()
+
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    from utilsREDESIGN import *