Add page counts to doc.json. Fixes #1936. Commit ready for merge.

 - Legacy-Id: 11122

ietf/doc/tests.py

@@ -696,6 +696,9 @@ def test_document_json(self):
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_json", kwargs=dict(name=doc.name)))
         self.assertEqual(r.status_code, 200)
+        data = json.loads(r.content)
+        self.assertEqual(doc.name, data['name'])
+        self.assertEqual(doc.pages,data['pages'])
 
     def test_writeup(self):
         doc = make_test_data()

ietf/doc/utils.py

@@ -582,6 +582,8 @@ def get_ancestors(doc):
                         'published': e.time.isoformat(),
                         'url': url,
                     }
+                    if d.history_set.filter(rev=e.newrevisiondocevent.rev).exists():
+                        history[url]['pages'] = d.history_set.filter(rev=e.newrevisiondocevent.rev).first().pages
 
     if doc.type_id == "draft":
         e = doc.latest_event(type='published_rfc')
@@ -595,5 +597,7 @@ def get_ancestors(doc):
             'published': e.time.isoformat(),
             'url': url
         }
+        if doc.history_set.filter(rev=e.newrevisiondocevent.rev).exists():
+            history[url]['pages'] = doc.history_set.filter(rev=e.newrevisiondocevent.rev).first().pages
     history = history.values()
     return sorted(history, key=lambda x: x['published'])

ietf/doc/views_doc.py

@@ -908,6 +908,7 @@ def extract_name(s):
 
     data["name"] = doc.name
     data["rev"] = doc.rev
+    data["pages"] = doc.pages
     data["time"] = doc.time.strftime("%Y-%m-%d %H:%M:%S")
     data["group"] = None
     if doc.group: