浏览代码

fix static html num_outputs info

Nick Sweeting 5 年之前
父节点
当前提交
7fdea91311
共有 2 个文件被更改,包括 14 次插入7 次删除
  1. 9 6
      archivebox/core/views.py
  2. 5 1
      archivebox/index/schema.py

+ 9 - 6
archivebox/core/views.py

@@ -135,12 +135,15 @@ class AddView(UserPassesTestMixin, FormView):
     def test_func(self):
         return PUBLIC_ADD_VIEW or self.request.user.is_authenticated
 
-    def get_context_data(self, *args, **kwargs):
-        context = super().get_context_data(*args, **kwargs)
-        context["title"] = "Add URLs"
-        # We can't just call request.build_absolute_uri in the template, because it would include query parameters
-        context["absolute_add_path"] = self.request.build_absolute_uri(self.request.path)
-        return context
+    def get_context_data(self, **kwargs):
+        return {
+            **super().get_context_data(**kwargs),
+            'title': "Add URLs",
+            # We can't just call request.build_absolute_uri in the template, because it would include query parameters
+            'absolute_add_path': self.request.build_absolute_uri(self.request.path),
+            'VERSION': VERSION,
+            'FOOTER_INFO': FOOTER_INFO,
+        }
 
     def form_valid(self, form):
         url = form.cleaned_data["url"]

+ 5 - 1
archivebox/index/schema.py

@@ -207,6 +207,10 @@ class Link:
             })
         return info
 
+    def as_snapshot(self):
+        from core.models import Snapshot
+        return Snapshot.objects.get(url=self.url)
+
     @classmethod
     def from_json(cls, json_info, guess=False):
         from ..util import parse_date
@@ -339,7 +343,7 @@ class Link:
     ### Archive Status Helpers
     @property
     def num_outputs(self) -> int:
-        return len(tuple(filter(None, self.latest_outputs().values())))
+        return self.as_snapshot().num_outputs
 
     @property
     def num_failures(self) -> int: