From 7fdea91311dfb96dabb509ebc71a28b4a70956a0 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Sat, 28 Nov 2020 02:01:53 -0500 Subject: [PATCH] fix static html num_outputs info --- archivebox/core/views.py | 15 +++++++++------ archivebox/index/schema.py | 6 +++++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/archivebox/core/views.py b/archivebox/core/views.py index d613b94b..e8b20aec 100644 --- a/archivebox/core/views.py +++ b/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"] diff --git a/archivebox/index/schema.py b/archivebox/index/schema.py index 68d840a2..b5ea6733 100644 --- a/archivebox/index/schema.py +++ b/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: