diff --git a/ietf/doc/tests_bofreq.py b/ietf/doc/tests_bofreq.py index 93c0c5dba..460734450 100644 --- a/ietf/doc/tests_bofreq.py +++ b/ietf/doc/tests_bofreq.py @@ -97,7 +97,7 @@ This test section has some text. 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 @@ -105,7 +105,7 @@ This test section has some text. 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 @@ This test section has some text. 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') diff --git a/ietf/doc/urls_bofreq.py b/ietf/doc/urls_bofreq.py index 4dfde6e5a..9e92f6236 100644 --- a/ietf/doc/urls_bofreq.py +++ b/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), diff --git a/ietf/templates/doc/document_bofreq.html b/ietf/templates/doc/document_bofreq.html index 4529bcf3d..a5e194296 100644 --- a/ietf/templates/doc/document_bofreq.html +++ b/ietf/templates/doc/document_bofreq.html @@ -114,10 +114,37 @@ {% person_link leader %}{% if not forloop.last %}, {% endif %} {% endfor %} + - - - + {% with doc.docextresource_set.all as resources %} + {% if resources or is_editor or can_manage %} + + + Additional Resources + + {% if is_editor or can_manage %} + Edit + {% endif %} + + + {% if resources %} + + + {% for resource in resources|dictsort:"display_name" %} + {% if resource.name.type.slug == 'url' or resource.name.type.slug == 'email' %} + + {# Maybe make how a resource displays itself a method on the class so templates aren't doing this switching #} + {% else %} + + {% endif %} + {% endfor %} + +
- {% firstof resource.display_name resource.name.name %}
- {% firstof resource.display_name resource.name.name %}: {{resource.value}}
+ {% endif %} + + + {% endif %} + {% endwith %} @@ -125,7 +152,7 @@ {% 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 %}