altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Added Additional Resources. Simplified the bofreq urls file.

Browse source 
- Legacy-Id: 19204
This commit is contained in:
Robert Sparks 2021-07-07 22:28:05 +00:00
parent a76961deb0
commit 040e26be06
3 changed files with 34 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ietf/doc/tests_bofreq.py
View file

@ -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')

3
ietf/doc/urls_bofreq.py
View file

@ -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),

35
ietf/templates/doc/document_bofreq.html
View file

@ -114,10 +114,37 @@
{% person_link leader %}{% if not forloop.last %}, {% endif %}
{% endfor %}
</td>
</tr>
</tbody>
<tbody class="meta">
{% 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>
@ -125,7 +152,7 @@
<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>