Skip to content

Commit a76961d

Browse files
committed
Disallow saving unchanged template text. Remove stub for relations. Test changes to notify.
- Legacy-Id: 19203
1 parent f5a0426 commit a76961d

3 files changed

Lines changed: 26 additions & 5 deletions

File tree

ietf/doc/tests_bofreq.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
from django.conf import settings
1212
from django.urls import reverse as urlreverse
13+
from django.template.loader import render_to_string
1314

1415
from ietf.group.factories import RoleFactory
1516
from ietf.doc.factories import BofreqFactory, NewRevisionDocEventFactory
@@ -326,6 +327,10 @@ def test_start_new_bofreq(self):
326327
login_testing_unauthorized(self,nobody.user.username,url)
327328
r = self.client.get(url)
328329
self.assertContains(r,'Fill in the details below. Keep items in the order they appear here.',status_code=200)
330+
r = self.client.post(url, dict(title='default',
331+
bofreq_submission='enter',
332+
bofreq_content=render_to_string('doc/bofreq/bofreq_template.md',{})))
333+
self.assertContains(r, 'The example content may not be saved.', status_code=200)
329334
file = NamedTemporaryFile(delete=False,mode="w+",encoding='utf-8')
330335
file.write('some stuff')
331336
file.close()
@@ -360,3 +365,21 @@ def test_start_new_bofreq(self):
360365
self.assertEqual(r.status_code, 200)
361366
q = PyQuery(r.content)
362367
self.assertTrue(q('form div.has-error'))
368+
369+
def test_change_notify(self):
370+
doc = BofreqFactory()
371+
url = urlreverse('ietf.doc.views_doc.edit_notify;bofreq', kwargs=dict(name=doc.name))
372+
login_testing_unauthorized(self, "secretary", url)
373+
374+
# get
375+
r = self.client.get(url)
376+
self.assertEqual(r.status_code,200)
377+
q = PyQuery(r.content)
378+
self.assertEqual(len(q('form input[name=notify]')),1)
379+
380+
# Provide a list
381+
r = self.client.post(url,dict(notify="TJ2APh2P@ietf.org",save_addresses="1"))
382+
self.assertEqual(r.status_code,302)
383+
doc = reload_db_objects(doc)
384+
self.assertEqual(doc.notify,'TJ2APh2P@ietf.org')
385+

ietf/doc/urls_bofreq.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
urlpatterns = [
66
url(r'^notices/$', views_doc.edit_notify, name='ietf.doc.views_doc.edit_notify;bofreq'),
7-
url(r'^relations/$', views_bofreq.edit_relations),
87
url(r'^state/$', views_bofreq.change_state),
98
url(r'^submit/$', views_bofreq.submit),
109
url(r'^title/$', views_bofreq.edit_title),

ietf/doc/views_bofreq.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ def bof_requests(request):
3232
return render(request, 'doc/bofreq/bof_requests.html',dict(reqs=reqs))
3333

3434

35-
def edit_relations(request, name):
36-
raise NotImplementedError
37-
38-
3935
class BofreqUploadForm(forms.Form):
4036
ACTIONS = [
4137
("enter", "Enter content directly"),
@@ -47,6 +43,9 @@ class BofreqUploadForm(forms.Form):
4743

4844
def clean_bofreq_content(self):
4945
content = self.cleaned_data["bofreq_content"].replace("\r", "")
46+
default_content = render_to_string('doc/bofreq/bofreq_template.md',{})
47+
if content==default_content:
48+
raise forms.ValidationError('The example content may not be saved. Edit it as instructed to document this BoF request.')
5049
try:
5150
_ = markdown.markdown(content, extensions=['extra'])
5251
except Exception as e:

0 commit comments

Comments
 (0)