Fixed url lookups for doc.views_doc.document_main() to only use dotted-path, and removed the doc_view explicit url name. Fixes a 500 error in /submit/status/NNNN/.

 - Legacy-Id: 12897

Author: levkowetz

ietf/doc/models.py

@@ -228,7 +228,7 @@ def friendly_state(self):
             elif state.slug == "repl":
                 rs = self.related_that("replaces")
                 if rs:
-                    return mark_safe("Replaced by " + ", ".join("<a href=\"%s\">%s</a>" % (urlreverse('doc_view', kwargs=dict(name=alias.document)), alias.document) for alias in rs))
+                    return mark_safe("Replaced by " + ", ".join("<a href=\"%s\">%s</a>" % (urlreverse('ietf.doc.views_doc.document_main', kwargs=dict(name=alias.document)), alias.document) for alias in rs))
                 else:
                     return "Replaced"
             elif state.slug == "active":
@@ -439,7 +439,7 @@ def get_absolute_url(self):
                         filename = self.external_url
                     url = '%sproceedings/%s/%s/%s' % (settings.IETF_HOST_URL,meeting.number,self.type_id,filename)
                 return url
-        return urlreverse('doc_view', kwargs={ 'name': name }, urlconf="ietf.urls")
+        return urlreverse('ietf.doc.views_doc.document_main', kwargs={ 'name': name }, urlconf="ietf.urls")
 
 
     def file_tag(self):

ietf/doc/tests.py

@@ -128,63 +128,63 @@ def test_search_for_name(self):
         # exact match
         r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("doc_view", kwargs=dict(name=draft.name)))
+        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
 
         # prefix match
         r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(draft.name.split("-")[:-1]))))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("doc_view", kwargs=dict(name=draft.name)))
+        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
 
         # non-prefix match
         r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(draft.name.split("-")[1:]))))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("doc_view", kwargs=dict(name=draft.name)))
+        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
 
         # other doctypes than drafts
         doc = Document.objects.get(name='charter-ietf-mars')
         r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name='charter-ietf-ma')))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("doc_view", kwargs=dict(name=doc.name)))
+        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
 
         doc = Document.objects.filter(name__startswith='conflict-review-').first()
         r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(doc.name.split("-")[:-1]))))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("doc_view", kwargs=dict(name=doc.name)))
+        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
 
         doc = Document.objects.filter(name__startswith='status-change-').first()
         r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(doc.name.split("-")[:-1]))))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("doc_view", kwargs=dict(name=doc.name)))
+        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
 
         doc = Document.objects.filter(name__startswith='agenda-').first()
         r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(doc.name.split("-")[:-1]))))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("doc_view", kwargs=dict(name=doc.name)))
+        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
 
         doc = Document.objects.filter(name__startswith='minutes-').first()
         r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(doc.name.split("-")[:-1]))))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("doc_view", kwargs=dict(name=doc.name)))
+        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
 
         doc = Document.objects.filter(name__startswith='slides-').first()
         r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(doc.name.split("-")[:-1]))))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("doc_view", kwargs=dict(name=doc.name)))
+        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
 
         # match with revision
         r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name=draft.name + "-" + prev_rev)))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("doc_view", kwargs=dict(name=draft.name, rev=prev_rev)))
+        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name, rev=prev_rev)))
 
         # match with non-existing revision
         r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name=draft.name + "-09")))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("doc_view", kwargs=dict(name=draft.name)))
+        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
 
         # match with revision and extension
         r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name=draft.name + "-" + prev_rev + ".txt")))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("doc_view", kwargs=dict(name=draft.name, rev=prev_rev)))
+        self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name, rev=prev_rev)))
 
         # no match
         r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="draft-ietf-doesnotexist-42")))
@@ -448,46 +448,46 @@ def test_document_draft(self):
         # active draft
         draft.set_state(State.objects.get(type="draft", slug="active"))
 
-        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=draft.name)))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 200)
         self.assertTrue("Active Internet-Draft" in unicontent(r))
         self.assertTrue("Show full document text" in unicontent(r))
         self.assertFalse("Deimos street" in unicontent(r))
 
-        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=draft.name)) + "?include_text=0")
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)) + "?include_text=0")
         self.assertEqual(r.status_code, 200)
         self.assertTrue("Active Internet-Draft" in unicontent(r))
         self.assertFalse("Show full document text" in unicontent(r))
         self.assertTrue("Deimos street" in unicontent(r))
 
-        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=draft.name)) + "?include_text=foo")
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)) + "?include_text=foo")
         self.assertEqual(r.status_code, 200)
         self.assertTrue("Active Internet-Draft" in unicontent(r))
         self.assertFalse("Show full document text" in unicontent(r))
         self.assertTrue("Deimos street" in unicontent(r))
 
-        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=draft.name)) + "?include_text=1")
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)) + "?include_text=1")
         self.assertEqual(r.status_code, 200)
         self.assertTrue("Active Internet-Draft" in unicontent(r))
         self.assertFalse("Show full document text" in unicontent(r))
         self.assertTrue("Deimos street" in unicontent(r))
 
         self.client.cookies = SimpleCookie({'full_draft': 'on'})
-        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=draft.name)))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 200)
         self.assertTrue("Active Internet-Draft" in unicontent(r))
         self.assertFalse("Show full document text" in unicontent(r))
         self.assertTrue("Deimos street" in unicontent(r))
 
         self.client.cookies = SimpleCookie({'full_draft': 'off'})
-        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=draft.name)))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 200)
         self.assertTrue("Active Internet-Draft" in unicontent(r))
         self.assertTrue("Show full document text" in unicontent(r))
         self.assertFalse("Deimos street" in unicontent(r))
 
         self.client.cookies = SimpleCookie({'full_draft': 'foo'})
-        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=draft.name)))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 200)
         self.assertTrue("Active Internet-Draft" in unicontent(r))
         self.assertTrue("Show full document text" in unicontent(r))
@@ -496,7 +496,7 @@ def test_document_draft(self):
         # expired draft
         draft.set_state(State.objects.get(type="draft", slug="expired"))
 
-        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=draft.name)))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 200)
         self.assertTrue("Expired Internet-Draft" in unicontent(r))
 
@@ -517,7 +517,7 @@ def test_document_draft(self):
                                              target=draft.docalias_set.get(name__startswith="draft"),
                                              relationship_id="replaces")
 
-        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=draft.name)))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 200)
         self.assertTrue("Replaced Internet-Draft" in unicontent(r))
         self.assertTrue(replacement.name in unicontent(r))
@@ -532,12 +532,12 @@ def test_document_draft(self):
         rfc_alias = DocAlias.objects.create(name="rfc123456", document=draft)
         bcp_alias = DocAlias.objects.create(name="bcp123456", document=draft)
 
-        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=draft.name)))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 302)
-        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=bcp_alias.name)))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=bcp_alias.name)))
         self.assertEqual(r.status_code, 302)
 
-        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=rfc_alias.name)))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc_alias.name)))
         self.assertEqual(r.status_code, 200)
         self.assertTrue("RFC 123456" in unicontent(r))
         self.assertTrue(draft.name in unicontent(r))
@@ -551,12 +551,12 @@ def test_document_draft(self):
             group=Group.objects.get(type="individ"),
             std_level_id="ps")
         DocAlias.objects.create(name=rfc.name, document=rfc)
-        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=rfc.name)))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc.name)))
         self.assertEqual(r.status_code, 200)
         self.assertTrue("RFC 1234567" in unicontent(r))
 
         # unknown draft
-        r = self.client.get(urlreverse("doc_view", kwargs=dict(name="draft-xyz123")))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name="draft-xyz123")))
         self.assertEqual(r.status_code, 404)
 
     def test_document_primary_and_history_views(self):
@@ -582,28 +582,28 @@ def test_document_primary_and_history_views(self):
             doc.rev = "01"
             doc.save_with_history([DocEvent.objects.create(doc=doc, type="changed_document", by=Person.objects.get(user__username="secretary"), desc="Test")])
 
-            r = self.client.get(urlreverse("doc_view", kwargs=dict(name=doc.name)))
+            r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
             self.assertEqual(r.status_code, 200)
             self.assertTrue("%s-01"%docname in unicontent(r))
 
-            r = self.client.get(urlreverse("doc_view", kwargs=dict(name=doc.name,rev="01")))
+            r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name,rev="01")))
             self.assertEqual(r.status_code, 302)
 
-            r = self.client.get(urlreverse("doc_view", kwargs=dict(name=doc.name,rev="00")))
+            r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name,rev="00")))
             self.assertEqual(r.status_code, 200)
             self.assertTrue("%s-00"%docname in unicontent(r))
 
 class DocTestCase(TestCase):
     def test_document_charter(self):
         make_test_data()
 
-        r = self.client.get(urlreverse("doc_view", kwargs=dict(name="charter-ietf-mars")))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name="charter-ietf-mars")))
         self.assertEqual(r.status_code, 200)
 
     def test_document_conflict_review(self):
         make_test_data()
 
-        r = self.client.get(urlreverse("doc_view", kwargs=dict(name='conflict-review-imaginary-irtf-submission')))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name='conflict-review-imaginary-irtf-submission')))
         self.assertEqual(r.status_code, 200)
 
     def test_document_material(self):
@@ -630,7 +630,7 @@ def test_document_material(self):
             )
         SessionPresentation.objects.create(session=session, document=doc, rev=doc.rev)
 
-        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=doc.name)))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
         self.assertEqual(r.status_code, 200)
 
     def test_document_ballot(self):
@@ -799,17 +799,17 @@ def test_document_nonietf_pubreq_button(self):
         doc = make_test_data()
 
         self.client.login(username='iab-chair', password='iab-chair+password')
-        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=doc.name)))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
         self.assertEqual(r.status_code, 200)
         self.assertTrue("Request publication" not in unicontent(r))
 
         Document.objects.filter(pk=doc.pk).update(stream='iab')
-        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=doc.name)))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
         self.assertEqual(r.status_code, 200)
         self.assertTrue("Request publication" in unicontent(r))
 
         doc.states.add(State.objects.get(type_id='draft-stream-iab',slug='rfc-edit'))
-        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=doc.name)))
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
         self.assertEqual(r.status_code, 200)
         self.assertTrue("Request publication" not in unicontent(r))
 

ietf/doc/tests_review.py

@@ -111,7 +111,7 @@ def test_doc_page(self):
         review_req.doc = older_doc
         review_req.save()
 
-        url = urlreverse('doc_view', kwargs={ "name": doc.name })
+        url = urlreverse('ietf.doc.views_doc.document_main', kwargs={ "name": doc.name })
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         content = unicontent(r)
@@ -572,7 +572,7 @@ def test_complete_review_upload_content(self):
         self.assertTrue(settings.MAILING_LIST_ARCHIVE_URL in review_req.review.external_url)
 
         # check the review document page
-        url = urlreverse('doc_view', kwargs={ "name": review_req.review.name })
+        url = urlreverse('ietf.doc.views_doc.document_main', kwargs={ "name": review_req.review.name })
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         content = unicontent(r)

ietf/doc/tests_status_change.py

@@ -472,7 +472,7 @@ def test_subsequent_submission(self):
         self.assertTrue(q('textarea')[0].text.strip().startswith("Provide a description"))
 
         # make sure we can see the old revision
-        url = urlreverse('doc_view',kwargs=dict(name=doc.name,rev='00'))
+        url = urlreverse('ietf.doc.views_doc.document_main',kwargs=dict(name=doc.name,rev='00'))
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
         self.assertTrue("This is the old proposal." in unicontent(r))

ietf/doc/urls.py

@@ -64,7 +64,7 @@
     url(r'^active/$', views_search.index_active_drafts, name="index_active_drafts"),
     url(r'^select2search/(?P<model_name>(document|docalias))/(?P<doc_type>draft)/$', views_search.ajax_select2_search_docs, name="ajax_select2_search_docs"),
 
-    url(r'^%(name)s/(?:%(rev)s/)?$' % settings.URL_REGEXPS, views_doc.document_main, name="doc_view"),
+    url(r'^%(name)s/(?:%(rev)s/)?$' % settings.URL_REGEXPS, views_doc.document_main),
     url(r'^%(name)s/(?:%(rev)s/)?bibtex/$' % settings.URL_REGEXPS, views_doc.document_bibtex),
     url(r'^%(name)s/history/$' % settings.URL_REGEXPS, views_doc.document_history, name="doc_history"),
     url(r'^%(name)s/writeup/$' % settings.URL_REGEXPS, views_doc.document_writeup, name="doc_writeup"),

ietf/doc/utils.py

@@ -669,7 +669,7 @@ def get_ancestors(doc):
         for d in docs:
             for e in d.docevent_set.filter(type='new_revision').distinct():
                 if hasattr(e, 'newrevisiondocevent'):
-                    url = urlreverse("doc_view", kwargs=dict(name=d)) + e.newrevisiondocevent.rev + "/"
+                    url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=d)) + e.newrevisiondocevent.rev + "/"
                     history[url] = {
                         'name': d.name,
                         'rev': e.newrevisiondocevent.rev,
@@ -684,7 +684,7 @@ def get_ancestors(doc):
     else:
         e = doc.latest_event(type='iesg_approved')
     if e:
-        url = urlreverse("doc_view", kwargs=dict(name=e.doc))
+        url = urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=e.doc))
         history[url] = {
             'name': e.doc.canonical_name(),
             'rev': e.doc.canonical_name(),