Removed another explicit url() name which blocked a dotted-path reverse, causing 500 for ipr// urls.

- Legacy-Id: 12882

ietf/ipr/tests.py

@@ -148,6 +148,13 @@ class IprTests(TestCase):
         self.assertEqual(r.status_code, 200)
         self.assertTrue('This IPR disclosure was removed' in unicontent(r))
         
+    def test_ipr_history(self):
+        make_test_data()
+        ipr = IprDisclosureBase.objects.get(title='Statement regarding rights')
+        r = self.client.get(urlreverse("ietf.ipr.views.history", kwargs=dict(id=ipr.pk)))
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(ipr.title in unicontent(r))
+
     def test_iprs_for_drafts(self):
         draft = make_test_data()
         ipr = IprDisclosureBase.objects.get(title='Statement regarding rights')

ietf/ipr/urls.py

@@ -19,7 +19,7 @@ urlpatterns = [
     url(r'^(?P<id>\d+)/addemail/$', views.add_email, name='ipr_add_email'),
     url(r'^(?P<id>\d+)/edit/$', views.edit, name='ipr_edit'),
     url(r'^(?P<id>\d+)/email/$', views.email, name='ipr_email'),
-    url(r'^(?P<id>\d+)/history/$', views.history, name='ipr_history'),
+    url(r'^(?P<id>\d+)/history/$', views.history),
     url(r'^(?P<id>\d+)/notify/(?P<type>update|posted)/$', views.notify, name='ipr_notify'),
     url(r'^(?P<id>\d+)/post/$', views.post, name='ipr_post'),
     url(r'^(?P<id>\d+)/state/$', views.state, name='ipr_state'),

ietf/ipr/views.py

@@ -178,7 +178,7 @@ def add_comment(request, id):
                 desc=form.cleaned_data['comment']
             )
             messages.success(request, 'Comment added.')
-            return redirect("ipr_history", id=ipr.id)
+            return redirect("ietf.ipr.views.history", id=ipr.id)
     else:
         form = AddCommentForm()
   
@@ -192,7 +192,7 @@ def add_email(request, id):
     if request.method == 'POST':
         button_text = request.POST.get('submit', '')
         if button_text == 'Cancel':
-            return redirect("ipr_history", id=ipr.id)
+            return redirect("ietf.ipr.views.history", id=ipr.id)
         
         form = AddEmailForm(request.POST,ipr=ipr)
         if form.is_valid():
@@ -214,7 +214,7 @@ def add_email(request, id):
                 in_reply_to = in_reply_to
             )
             messages.success(request, 'Email added.')
-            return redirect("ipr_history", id=ipr.id)
+            return redirect("ietf.ipr.views.history", id=ipr.id)
     else:
         form = AddEmailForm(ipr=ipr)
         
@@ -703,7 +703,7 @@ def get_details_tabs(ipr, selected):
         t + (t[0].lower() == selected.lower(),)
         for t in [
         ('Disclosure', urlreverse('ietf.ipr.views.show', kwargs={ 'id': ipr.pk })),
-        ('History', urlreverse('ipr_history', kwargs={ 'id': ipr.pk }))
+        ('History', urlreverse('ietf.ipr.views.history', kwargs={ 'id': ipr.pk }))
     ]]
 
 def show(request, id):

ietf/templates/ipr/add_comment.html

@@ -19,7 +19,7 @@
     
     {% buttons %}
       <button type="submit" class="btn btn-primary">Add Comment</button>
-      <a class="btn btn-default pull-right" href="{% url "ipr_history" id=ipr.id %}">Back</a>
+      <a class="btn btn-default pull-right" href="{% url "ietf.ipr.views.history" id=ipr.id %}">Back</a>
     {% endbuttons %}
   </form>
 {% endblock %}

ietf/templates/ipr/add_email.html

@@ -19,7 +19,7 @@
     
     {% buttons %}
       <button type="submit" class="btn btn-primary">Add Email</button>
-      <a class="btn btn-default pull-right" href="{% url "ipr_history" id=ipr.id %}">Back</a>
+      <a class="btn btn-default pull-right" href="{% url "ietf.ipr.views.history" id=ipr.id %}">Back</a>
     {% endbuttons %}
   </form>
 {% endblock %}

ietf/templates/ipr/email.html

@@ -21,7 +21,7 @@
 
     {% buttons %}
       <button type="submit" class="btn btn-primary">Send Email</button>
-      <a class="btn btn-default pull-right" href="{% url "ipr_history" id=ipr.id %}">Back</a>
+      <a class="btn btn-default pull-right" href="{% url "ietf.ipr.views.history" id=ipr.id %}">Back</a>
     {% endbuttons %}
   </form>
 {% endblock %}