Merged in [7935] from liudapeng@chinamobile.com:

    Add brief_display function in Constraint class to display both WG conflict and person conflict. Fixes issue ietf-tools#1384.
 - Legacy-Id: 7938
Note: SVN reference [7935] has been migrated to Git commit 425f88c

Author: levkowetz

ietf/meeting/models.py

@@ -723,6 +723,16 @@ class Constraint(models.Model):
     def __unicode__(self):
         return u"%s %s target=%s person=%s" % (self.source, self.name.name.lower(), self.target, self.person)
 
+    def brief_display(self):
+        if self.target and self.person:
+            return u"%s ; %s" % (self.target.acronym, self.person)
+        elif self.target and not self.person:
+            return u"%s " % (self.target.acronym)
+        elif not self.target and self.person:
+            return u"%s " % (self.person)
+
+
+
     @property
     def person_conflicted(self):
         if self.person is None:

ietf/templates/meeting/requests.html

@@ -55,7 +55,7 @@ <h2><a name="{{session.group.parent.acronym}}">{{session.group.parent.acronym|up
   <td valign="top">
     {% if session.group.ad %}<a href="mailto:{{session.group.ad.email_address}}">{{session.group.ad}}</a> {%endif%}
   </td>
-  <td width="30%" valign="top">{%if session.requested_duration%}<span>{% for constraint in session.constraints %}{%ifchanged%}</span><span class="{{constraint.name.slug}}">{%endifchanged%} {{constraint.target.acronym}}{% if constraint.target.parent.id == constraint.source.parent.id%} ({{constraint.target.parent.acronym}}){%endif%}{%if not forloop.last %},{%endif%} {% endfor %}</span>{%endif%}</td>
+  <td width="30%" valign="top">{%if session.requested_duration%}<span>{% for constraint in session.constraints %}{%ifchanged%}</span><span class="{{constraint.name.slug}}">{%endifchanged%} {% if constraint %} {% if not forloop.first %}, {%endif%}{{constraint.brief_display}}{% if constraint.target.parent.id == constraint.source.parent.id%} ({{constraint.target.parent.acronym}}){%endif%} {% endif %} {% endfor %}</span>{%endif%}</td>
   <td width="30%" valign="top">{% if session.comments %}<i><font color="#800000">{{session.comments|linebreaksbr}}</font></i>{% endif %}</td>
 </tr>
 {% endif %}