From 48aec1534324ef17755a3edd2c379ff141c2b993 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 24 Mar 2012 17:10:22 -0500 Subject: Revert "Add some dev dashboard info regarding signed package count" This reverts commit 797185faed0555efb88a1e6a18e447548a9935fd. Now that all packages in the Arch repos are signed, this column isn't very useful as it just reflects the total package count. Conflicts: packages/views.py -> packages/views/search.py Signed-off-by: Dan McGee --- main/models.py | 4 ---- packages/views/search.py | 8 -------- templates/devel/index.html | 5 ----- 3 files changed, 17 deletions(-) diff --git a/main/models.py b/main/models.py index 7d017242..289cbb84 100644 --- a/main/models.py +++ b/main/models.py @@ -74,10 +74,6 @@ class PackageManager(models.Manager): """Used by dev dashboard.""" return self.filter(flag_date__isnull=False) - def signed(self): - """Used by dev dashboard.""" - return self.filter(pgp_signature__isnull=False) - def normal(self): return self.select_related('arch', 'repo') diff --git a/packages/views/search.py b/packages/views/search.py index 65fcddb3..1431893d 100644 --- a/packages/views/search.py +++ b/packages/views/search.py @@ -44,9 +44,6 @@ class PackageSearchForm(forms.Form): flagged = forms.ChoiceField( choices=[('', 'All')] + make_choice(['Flagged', 'Not Flagged']), required=False) - signed = forms.ChoiceField( - choices=[('', 'All')] + make_choice(['Signed', 'Unsigned']), - required=False) limit = LimitTypedChoiceField( choices=make_choice([50, 100, 250]) + [('all', 'All')], coerce=coerce_limit_value, @@ -97,11 +94,6 @@ def parse_form(form, packages): elif form.cleaned_data['flagged'] == 'Not Flagged': packages = packages.filter(flag_date__isnull=True) - if form.cleaned_data['signed'] == 'Signed': - packages = packages.filter(pgp_signature__isnull=False) - elif form.cleaned_data['signed'] == 'Unsigned': - packages = packages.filter(pgp_signature__isnull=True) - if form.cleaned_data['last_update']: lu = form.cleaned_data['last_update'] packages = packages.filter(last_update__gte= diff --git a/templates/devel/index.html b/templates/devel/index.html index 02019366..63d18193 100644 --- a/templates/devel/index.html +++ b/templates/devel/index.html @@ -183,7 +183,6 @@ Arch # Packages # Flagged - # Signed @@ -196,8 +195,6 @@ {{ arch.packages.flagged.count }} packages - - {{ arch.packages.signed.count }} packages {% endfor %} @@ -216,7 +213,6 @@ Repository # Packages # Flagged - # Signed @@ -229,7 +225,6 @@ {{ repo.packages.flagged.count }} packages - {{ repo.packages.signed.count }} packages {% endfor %} -- cgit v1.2.3-55-g3dc8