Fix some bugs in the trunk merge found through the automated tests

- Legacy-Id: 3692

ietf/idrfc/mails.py

@@ -352,18 +352,18 @@ def generate_approval_mail_rfc_editorREDESIGN(request, doc):
 
     to = []
     if doc.group:
-        for r in doc.group.roles_set.filter(name="chair").select_related():
+        for r in doc.group.role_set.filter(name="chair").select_related():
             to.append(r.formatted_email())
 
         if doc.stream_id == "ise":
             # include ISE chair
             g = Group.objects.get(type='individ')
-            for r in g.roles_set.filter(name="chair").select_related():
+            for r in g.role_set.filter(name="chair").select_related():
                 to.append(r.formatted_email())
         elif doc.stream_id == "irtf":
             # include IRTF chair
             g = Group.objects.get(type='irtf')
-            for r in g.roles_set.filter(name="chair").select_related():
+            for r in g.role_set.filter(name="chair").select_related():
                 to.append(r.formatted_email())
             # and IRSG
             to.append('"Internet Research Steering Group" <irsg@irtf.org>')

ietf/idrfc/testsREDESIGN.py

@@ -56,7 +56,7 @@ class IdRfcUrlTestCase(SimpleUrlTestCase):
         #self.doTestUrls(__file__)
         self.doTestUrls(os.path.join(os.path.dirname(os.path.abspath(__file__)), "testurlREDESIGN.list"))
 
-        
+
 class ChangeStateTestCase(django.test.TestCase):
     fixtures = ['names']
 
@@ -109,7 +109,7 @@ class ChangeStateTestCase(django.test.TestCase):
         r = self.client.get(url)
         self.assertEquals(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEquals(len(q('.prev-state form input[name="state"][value="ad-eval"]')), 1)
+        self.assertEquals(len(q('.prev-state form input[name="state"]')), 1)
 
         
     def test_request_last_call(self):
@@ -198,7 +198,7 @@ class EditInfoTestCase(django.test.TestCase):
         self.assertEquals(draft.ad, new_ad)
         self.assertEquals(draft.note, "New note")
         self.assertTrue(not draft.latest_event(TelechatDocEvent, type="telechat_date"))
-        self.assertEquals(draft.docevent_set.count(), events_before + 4)
+        self.assertEquals(draft.docevent_set.count(), events_before + 3)
         self.assertEquals(len(outbox), mailbox_before + 1)
         self.assertTrue(draft.name in outbox[-1]['Subject'])
 
@@ -284,9 +284,9 @@ class EditInfoTestCase(django.test.TestCase):
         self.assertEquals(draft.ad, ad)
         self.assertEquals(draft.note, "This is a note")
         self.assertTrue(not draft.latest_event(TelechatDocEvent, type="scheduled_for_telechat"))
-        self.assertEquals(draft.docevent_set.count(), events_before + 4)
+        self.assertEquals(draft.docevent_set.count(), events_before + 3)
         events = list(draft.docevent_set.order_by('time', 'id'))
-        self.assertEquals(events[-4].type, "started_iesg_process")
+        self.assertEquals(events[-3].type, "started_iesg_process")
         self.assertEquals(len(outbox), mailbox_before)
 
 

ietf/idrfc/views_edit.py

@@ -161,7 +161,7 @@ def change_stateREDESIGN(request, name):
         prev_state = hists[0].get_state("draft-iesg")
 
     to_iesg_eval = None
-    if not self.latest_event(type="sent_ballot_announcement"):
+    if not doc.latest_event(type="sent_ballot_announcement"):
         if next_states and next_states.filter(slug="iesg-eva"):
             to_iesg_eval = State.objects.get(type="draft-iesg", slug="iesg-eva")
             next_states = next_states.exclude(slug="iesg-eva")

ietf/templates/idrfc/change_stateREDESIGN.html

@@ -60,7 +60,7 @@ form.change-state .actions {
   </form>
   <p> 
      But the ballot for this document has not yet been issued. 
-     <a href="{% url doc_ballot_writeupnotes name=doc.filename %}">Edit Ballot Text</a>
+     <a href="{% url doc_ballot_writeupnotes name=doc.name %}">Edit Ballot Text</a>
   </p>
 </div>
 {% endif %}

ietf/templates/idrfc/edit_infoREDESIGN.html

@@ -39,7 +39,7 @@ form.edit-info .actions {
       <td>{{ field }}
       {% ifequal field.name "telechat_date" %}
         {% if not ballot_issued %}
-         <span id="ballotwarn"> A ballot for this document has not been issued: <a href="{% url doc_ballot_writeupnotes name=doc.filename %}">Edit Ballot Text</a></span>
+         <span id="ballotwarn"> A ballot for this document has not been issued: <a href="{% url doc_ballot_writeupnotes name=doc.name %}">Edit Ballot Text</a></span>
         {% endif %}
         {{ form.returning_item }} {{ form.returning_item.label_tag }} {{ form.returning_item.errors }}
       {% endifequal %}

redesign/name/proxy.py

@@ -49,5 +49,15 @@ class AnnotationTagObjectRelationProxy(DocTagName):
         proxy = True
 
 class StreamProxy(DocStreamName):
+    def get_chairs(self):
+        from redesign.group.models import Role
+        from redesign.proxy_utils import proxy_personify_role
+        return [proxy_personify_role(r) for r in Role.objects.filter(group__acronym=self.slug, name="chair")]
+
+    def get_delegates(self):
+        from redesign.group.models import Role
+        from redesign.proxy_utils import proxy_personify_role
+        return [proxy_personify_role(r) for r in Role.objects.filter(group__acronym=self.slug, name="delegate")]
+
     class Meta:
         proxy = True