Added Additional Resources. Simplified the bofreq urls file.

 - Legacy-Id: 19204

Author: rjsparks

ietf/doc/tests_bofreq.py

@@ -97,15 +97,15 @@ def test_bofreq_main_page(self):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
-            self.assertEqual(5, len(q('td.edit>a.btn')))
+            self.assertEqual(6, len(q('td.edit>a.btn')))
             self.client.logout()
             self.assertNotEqual([],q('#change-request'))
         editor = editors.first().user.username
         self.client.login(username=editor, password=editor+"+password")
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
         q = PyQuery(r.content)
-        self.assertEqual(2, len(q('td.edit>a.btn')))
+        self.assertEqual(3, len(q('td.edit>a.btn')))
         self.assertNotEqual([],q('#change-request'))
         self.client.logout()
         url = urlreverse('ietf.doc.views_doc.document_main', kwargs=dict(name=doc,rev='00'))
@@ -365,21 +365,4 @@ def test_start_new_bofreq(self):
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
             self.assertTrue(q('form div.has-error'))
-
-    def test_change_notify(self):
-        doc = BofreqFactory()
-        url = urlreverse('ietf.doc.views_doc.edit_notify;bofreq', kwargs=dict(name=doc.name))
-        login_testing_unauthorized(self, "secretary", url)
-
-        # get
-        r = self.client.get(url)
-        self.assertEqual(r.status_code,200)
-        q = PyQuery(r.content)
-        self.assertEqual(len(q('form input[name=notify]')),1)
-
-        # Provide a list
-        r = self.client.post(url,dict(notify="TJ2APh2P@ietf.org",save_addresses="1"))
-        self.assertEqual(r.status_code,302)
-        doc = reload_db_objects(doc)
-        self.assertEqual(doc.notify,'TJ2APh2P@ietf.org')
 

ietf/doc/urls_bofreq.py

@@ -1,9 +1,8 @@
 
-from ietf.doc import views_bofreq, views_doc
+from ietf.doc import views_bofreq
 from ietf.utils.urls import url
 
 urlpatterns = [
-    url(r'^notices/$',               views_doc.edit_notify,              name='ietf.doc.views_doc.edit_notify;bofreq'),
     url(r'^state/$',                 views_bofreq.change_state),
     url(r'^submit/$',                views_bofreq.submit),
     url(r'^title/$',                 views_bofreq.edit_title),

ietf/templates/doc/document_bofreq.html

@@ -114,18 +114,45 @@
             {% person_link leader %}{% if not forloop.last %}, {% endif %}
           {% endfor %}
         </td>
-
-    </tbody>
-
-    <tbody class="meta">
+      </tr>  
+
+      {% with doc.docextresource_set.all as resources %}
+        {% if resources or is_editor or can_manage %}
+          <tr>
+            <td></td>
+            <th>Additional Resources</th>
+            <td class="edit">
+              {% if is_editor or can_manage %}
+                <a class="btn btn-default btn-xs" href="{% url 'ietf.doc.views_draft.edit_doc_extresources' name=doc.name %}">Edit</a> 
+              {% endif %}
+            </td>
+            <td>
+              {% if resources %}
+              <table class="col-md-12 col-sm-12 col-xs-12">
+                <tbody>
+                  {% for resource in resources|dictsort:"display_name" %}
+                    {% if resource.name.type.slug == 'url' or resource.name.type.slug == 'email' %}
+                      <tr><td> - <a href="{{ resource.value }}" title="{{resource.name.name}}">{% firstof resource.display_name resource.name.name %}</a></td></tr> 
+                      {# Maybe make how a resource displays itself a method on the class so templates aren't doing this switching #}
+                    {% else %}
+                      <tr><td> - <span title="{{resource.name.name}}">{% firstof resource.display_name resource.name.name %}: {{resource.value}}</span></td></tr>
+                    {% endif %}
+                  {% endfor %}
+                </tbody>
+              </table>
+              {% endif %}
+            </td>
+          </tr>
+        {% endif %}
+      {% endwith %}
 
       <tr>
       	<td></td>
       	<th>Send notices to</th>
       	<td class="edit">
           {% if not snapshot %}
         	  {% if can_manage %}
-        	    {% doc_edit_button 'ietf.doc.views_doc.edit_notify;bofreq' name=doc.name %}
+        	    {% doc_edit_button 'ietf.doc.views_doc.edit_notify' name=doc.name %}
             {% endif %}
       	  {% endif %}
       	</td>