View for adding comments, use login helper in tests

 - Legacy-Id: 2273

Author: OleLaursen

branch/iesg-tracker/ietf/idrfc/tests.py

@@ -41,7 +41,7 @@
 
 from ietf.idrfc.models import *
 from ietf.idtracker.models import *
-from ietf.utils.test_utils import SimpleUrlTestCase, RealDatabaseTest
+from ietf.utils.test_utils import SimpleUrlTestCase, RealDatabaseTest, login_testing_unauthorized
 from ietf.utils.test_runner import mail_outbox
 
 class IdRfcUrlTestCase(SimpleUrlTestCase):
@@ -53,19 +53,12 @@ class ChangeStateTestCase(django.test.TestCase):
 
     def test_change_state(self):
         draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
+        url = urlreverse('doc_change_state', kwargs=dict(name=draft.filename))
+        login_testing_unauthorized(self, "klm", url)
 
         state = draft.idinternal.cur_state
         substate = draft.idinternal.cur_sub_state
         next_states = IDNextState.objects.filter(cur_state=draft.idinternal.cur_state)
-        url = urlreverse('doc_change_state', kwargs=dict(name=draft.filename))
-        
-        # unauthorized get
-        r = self.client.get(url)
-        self.assertEquals(r.status_code, 302)
-        self.assertTrue("/accounts/login" in r['Location'])
-
-        
-        self.client.login(remote_user="klm")
 
         # normal get
         r = self.client.get(url)
@@ -143,16 +136,8 @@ class EditInfoTestCase(django.test.TestCase):
 
     def test_edit_info(self):
         draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
-
         url = urlreverse('doc_edit_info', kwargs=dict(name=draft.filename))
-        
-        # unauthorized get
-        r = self.client.get(url)
-        self.assertEquals(r.status_code, 302)
-        self.assertTrue("/accounts/login" in r['Location'])
-
-        
-        self.client.login(remote_user="klm")
+        login_testing_unauthorized(self, "klm", url)
 
         # normal get
         r = self.client.get(url)
@@ -209,17 +194,10 @@ def test_request_resurrect(self):
         self.assertEquals(draft.status.status, "Expired")
         self.assertTrue(not draft.idinternal.resurrect_requested_by)
 
-        
         url = urlreverse('doc_request_resurrect', kwargs=dict(name=draft.filename))
-        
-        # unauthorized get
-        r = self.client.get(url)
-        self.assertEquals(r.status_code, 302)
-        self.assertTrue("/accounts/login" in r['Location'])
-
-
         login_as = "rhousley"
-        self.client.login(remote_user=login_as)
+        
+        login_testing_unauthorized(self, login_as, url)
 
         # normal get
         r = self.client.get(url)
@@ -241,6 +219,32 @@ def test_request_resurrect(self):
         self.assertTrue(len(mail_outbox) == 1)
         self.assertTrue("Resurrection" in mail_outbox[0]['Subject'])
 
+class AddCommentTestCase(django.test.TestCase):
+    fixtures = ['base', 'draft']
+
+    def test_add_comment(self):
+        draft = InternetDraft.objects.get(filename="draft-ietf-mip6-cn-ipsec")
+        url = urlreverse('doc_add_comment', kwargs=dict(name=draft.filename))
+        login_testing_unauthorized(self, "klm", url)
+
+        # normal get
+        r = self.client.get(url)
+        self.assertEquals(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEquals(len(q('form textarea[name=comment]')), 1)
+
+        # request resurrect
+        comments_before = draft.idinternal.comments().count()
+        
+        r = self.client.post(url, dict(comment="This is a test."))
+        self.assertEquals(r.status_code, 302)
+
+        self.assertEquals(draft.idinternal.comments().count(), comments_before + 1)
+        self.assertTrue("This is a test." in draft.idinternal.comments()[0].comment_text)
+        self.assertTrue(len(mail_outbox) == 1)
+        self.assertTrue("updated" in mail_outbox[0]['Subject'])
+        self.assertTrue(draft.filename in mail_outbox[0]['Subject'])
+        
 
 TEST_RFC_INDEX = '''<?xml version="1.0" encoding="UTF-8"?>
 <rfc-index xmlns="http://www.rfc-editor.org/rfc-index" 

branch/iesg-tracker/ietf/idrfc/urls.py

@@ -45,4 +45,5 @@
     url(r'^(?P<name>[^/]+)/edit/state/$', views_edit.change_state, {}, name='doc_change_state'),
     url(r'^(?P<name>[^/]+)/edit/info/$', views_edit.edit_info, {}, name='doc_edit_info'),
     url(r'^(?P<name>[^/]+)/edit/resurrect/$', views_edit.request_resurrect, {}, name='doc_request_resurrect'),
+    url(r'^(?P<name>[^/]+)/edit/addcomment/$', views_edit.add_comment, {}, name='doc_add_comment'),                       
 )

branch/iesg-tracker/ietf/idrfc/views_edit.py

@@ -19,9 +19,9 @@ class ChangeStateForm(forms.Form):
     state = forms.ModelChoiceField(IDState.objects.all(), empty_label=None, required=True)
     substate = forms.ModelChoiceField(IDSubState.objects.all(), required=False)
 
-def add_document_comment(request, doc, text):
+def add_document_comment(request, doc, text, include_by=True):
     login = IESGLogin.objects.get(login_name=request.user.username)
-    if not 'Earlier history' in text:
+    if include_by:
         text += " by %s" % login
 
     c = DocumentComment()
@@ -311,3 +311,29 @@ def request_resurrect(request, name):
     return render_to_response('idrfc/request_resurrect.html',
                               dict(doc=doc),
                               context_instance=RequestContext(request))
+
+class AddCommentForm(forms.Form):
+    comment = forms.CharField(required=True, widget=forms.Textarea)
+
+@group_required('Area_Director','Secretariat')
+def add_comment(request, name):
+    doc = get_object_or_404(InternetDraft, filename=name)
+    if not doc.idinternal:
+        raise Http404()
+
+    login = IESGLogin.objects.get(login_name=request.user.username)
+
+    if request.method == 'POST':
+        form = AddCommentForm(request.POST)
+        if form.is_valid():
+            c = form.cleaned_data['comment']
+            add_document_comment(request, doc, c, include_by=False)
+            email_owner(request, doc, doc.idinternal.job_owner, login, "A new comment added by %s" % login)
+            return HttpResponseRedirect(doc.idinternal.get_absolute_url())
+    else:
+        form = AddCommentForm()
+  
+    return render_to_response('idrfc/add_comment.html',
+                              dict(doc=doc,
+                                   form=form),
+                              context_instance=RequestContext(request))

branch/iesg-tracker/ietf/templates/idrfc/add_comment.html

@@ -0,0 +1,11 @@
+<form action="" method="POST">
+  <table>
+    {{ form.as_table }}
+  </table>
+
+  <div class="actions">
+    <a href="{{ doc.idinternal.get_absolute_url }}">Back</a>
+    <input type="submit" value="Add comment"/>
+  </div>
+</form>
+

branch/iesg-tracker/ietf/templates/idrfc/doc_main.html

@@ -86,14 +86,14 @@ <h1>{% block doc_h1 %}{% endblock %}</h1>
   {% if doc.in_ietf_process %}
   {% ifequal doc.draft_status "Expired" %}
   {% if not doc.resurrect_requested_by %}
-  <span id="doc_edit_state_button" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child"><a href="{% url doc_request_resurrect name=doc.draft_name %}">Request resurrect</a></span></span>
+  <span id="doc_request_resurrect_button" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child"><a href="{% url doc_request_resurrect name=doc.draft_name %}">Request resurrect</a></span></span>
   {% endif %}
   {% else %}
   <span id="doc_edit_state_button" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child"><a href="{% url doc_change_state name=doc.draft_name %}">Change state</a></span></span>
 
   <span id="doc_edit_info_button" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child"><a href="{% url doc_edit_info name=doc.draft_name %}">Edit</a></span></span>
   {% endifequal %}
-  {% endif%}
+  {% endif %}
 <span id="doc_edit_button" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child">{% if doc.in_ietf_process %}
 <a href="https://datatracker.ietf.org/cgi-bin/idtracker.cgi?command=view_id&amp;{% if info.is_rfc %}dTag={{doc.rfc_number}}&amp;rfc_flag=1{% else %}dTag={{doc.tracker_id}}{% endif %}" rel="nofollow" target="_blank">Edit state (IESG Tracker)</a>
 {% else %}
@@ -144,6 +144,12 @@ <h1>{% block doc_h1 %}{% endblock %}</h1>
 {% include "idrfc/doc_diffs.html" %}
 {% endif %}
 <h2 style="margin-top:1em;">Document history</h2>
+{% if user|in_group:"Area_Director,Secretariat" and doc.in_ietf_process %}
+<div style="margin-bottom:8px" id="history_actions">
+  <span id="doc_add_comment_button" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child"><a href="{% url doc_add_comment name=doc.draft_name %}">Add comment</a></span></span>
+</div>
+{% endif %}
+
 {% include "idrfc/doc_history.html" %}
 </div>
 </div>