From eef1ee7051093b9f6e74ab5669af8c57983872d9 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 19 May 2012 16:32:17 -0500
Subject: Add RSS links to /news/ and /packages/ URLs

These were available only from the home page, but it makes sense to
advertise them on the corresponding index pages too.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/packages/search.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'templates/packages/search.html')

diff --git a/templates/packages/search.html b/templates/packages/search.html
index ebd4e6c4..df5c5791 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -8,6 +8,7 @@
 {% block head %}
 {% if is_paginated and page_obj.number > 1 %}<meta name="robots" content="noindex, nofollow"/>{% endif %}
 <link rel="stylesheet" type="text/css" href="{% static "admin/css/widgets.css" %}" />
+<link rel="alternate" type="application/rss+xml" title="Arch Linux Package Updates" href="/feeds/packages/" />
 {% endblock %}
 
 {% block content %}
-- 
cgit v1.2.3-54-g00ecf


From 2a12d0f80dae079cd50bc3232ec2196ecb8611d1 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Mon, 23 Jul 2012 09:57:03 -0500
Subject: Minor template touchups

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/packages/search.html | 2 +-
 templates/public/index.html    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates/packages/search.html')

diff --git a/templates/packages/search.html b/templates/packages/search.html
index df5c5791..9d86cedf 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -115,7 +115,7 @@ <h3>Package Search</h3>
     using different criteria, or try
     {% if search_form.q.data %}
     <a href="https://aur.archlinux.org/packages.php?K={{ search_form.q.data|urlencode }}">searching the AUR</a>
-    {% else %}searching the AUR{% endif %}
+    {% else %}searching the <a href="https://aur.archlinux.org/">AUR</a>{% endif %}
     to see if the package can be found there.</p>
 </div>
 {% endif %}
diff --git a/templates/public/index.html b/templates/public/index.html
index 32e25f98..0b97baf8 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -155,7 +155,7 @@ <h4>Tools</h4>
             title="Get a custom mirrorlist from our database">Mirrorlist Updater</a></li>
         <li><a href="{% url 'mirror-status' %}"
             title="Check the status of all known mirrors">Mirror Status</a></li>
-        <li><a href="/packages/differences/"
+        <li><a href="{% url 'packages-differences' %}"
             title="See differences in packages between available architectures">Differences Reports</a>
         <img width="16" height="16" src="{% static "new.png" %}" alt="New"/></li>
     </ul>
-- 
cgit v1.2.3-54-g00ecf


From 4ad43fd8165834b26914ff8ba0666ce96267205b Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 31 Jul 2012 00:25:19 -0500
Subject: Fix broken hidden input sort field on search form

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 packages/views/search.py       | 2 +-
 templates/packages/search.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates/packages/search.html')

diff --git a/packages/views/search.py b/packages/views/search.py
index 9750894a..497d9bca 100644
--- a/packages/views/search.py
+++ b/packages/views/search.py
@@ -40,7 +40,7 @@ class PackageSearchForm(forms.Form):
     name = forms.CharField(required=False)
     desc = forms.CharField(required=False)
     q = forms.CharField(required=False)
-    sort = forms.CharField(required=False)
+    sort = forms.CharField(required=False, widget=forms.HiddenInput())
     maintainer = forms.ChoiceField(required=False)
     packager = forms.ChoiceField(required=False)
     last_update = forms.DateField(required=False, widget=AdminDateWidget(),
diff --git a/templates/packages/search.html b/templates/packages/search.html
index 9d86cedf..ab9b6d32 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -19,7 +19,7 @@ <h2>Package Database</h2>
     <h3>Package Search</h3>
 
     <form id="pkg-search" method="get" action="/packages/">
-        <p><input type="hidden" name="sort" value='{{sort}}' /></p>
+        <p>{{ search_form.sort }}</p>
         {{ search_form.non_field_errors }}
         <fieldset>
             <legend>Enter search criteria</legend>
-- 
cgit v1.2.3-54-g00ecf


From e65c7805547484cad1be55dfa20355ef18b857be Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Fri, 8 Feb 2013 21:09:47 -0600
Subject: Remove package seach by 'Last Updated After'

It is a lot easier to just sort the list rather than mess with this
particular field, which didn't even allow you to specify a range or
direction to search in.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 packages/views/search.py       |  9 ---------
 templates/packages/search.html | 14 --------------
 2 files changed, 23 deletions(-)

(limited to 'templates/packages/search.html')

diff --git a/packages/views/search.py b/packages/views/search.py
index 0f313ccb..9cb5f38d 100644
--- a/packages/views/search.py
+++ b/packages/views/search.py
@@ -3,7 +3,6 @@
 from pytz import utc
 
 from django import forms
-from django.contrib.admin.widgets import AdminDateWidget
 from django.contrib.auth.models import User
 from django.db.models import Q
 from django.http import HttpResponse
@@ -44,8 +43,6 @@ class PackageSearchForm(forms.Form):
     sort = forms.CharField(required=False, widget=forms.HiddenInput())
     maintainer = forms.ChoiceField(required=False)
     packager = forms.ChoiceField(required=False)
-    last_update = forms.DateField(required=False, widget=AdminDateWidget(),
-            label='Last Updated After')
     flagged = forms.ChoiceField(
             choices=[('', 'All')] + make_choice(['Flagged', 'Not Flagged']),
             required=False)
@@ -104,12 +101,6 @@ def parse_form(form, packages):
     elif form.cleaned_data['flagged'] == 'Not Flagged':
         packages = packages.filter(flag_date__isnull=True)
 
-    if form.cleaned_data['last_update']:
-        lu = form.cleaned_data['last_update']
-        cutoff = datetime(lu.year, lu.month, lu.day, 0, 0)
-        cutoff = cutoff.replace(tzinfo=utc)
-        packages = packages.filter(last_update__gte=cutoff)
-
     if form.cleaned_data['name']:
         name = form.cleaned_data['name']
         packages = packages.filter(pkgname=name)
diff --git a/templates/packages/search.html b/templates/packages/search.html
index ab9b6d32..a5d52d6c 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -1,13 +1,11 @@
 {% extends "base.html" %}
 {% load package_extras %}
-{% load admin_static %}
 
 {% block title %}Arch Linux - Package Database{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block head %}
 {% if is_paginated and page_obj.number > 1 %}<meta name="robots" content="noindex, nofollow"/>{% endif %}
-<link rel="stylesheet" type="text/css" href="{% static "admin/css/widgets.css" %}" />
 <link rel="alternate" type="application/rss+xml" title="Arch Linux Package Updates" href="/feeds/packages/" />
 {% endblock %}
 
@@ -35,9 +33,6 @@ <h3>Package Search</h3>
             <div>{{ search_form.maintainer.errors }}
                 <label for="id_maintainer" title="Limit results to a specific maintainer">
                     Maintainer</label>{{ search_form.maintainer}}</div>
-            <div>{{ search_form.last_update.errors }}
-                <label for="id_last_update" title="Limit results to a date after the date entered">
-                    Last Updated After</label>{{ search_form.last_update }}</div>
             <div>{{ search_form.flagged.errors }}
                 <label for="id_flagged" title="Limit results based on out-of-date status">
                     Flagged</label>{{ search_form.flagged }}</div>
@@ -126,13 +121,4 @@ <h3>Package Search</h3>
     For unsupported packages, browse the <a href="https://aur.archlinux.org/"
         title="AUR package database">Arch User Repository (AUR).</a></p>
 </div>
-
-{% load cdn %}{% jquery %}
-<script type="text/javascript" src="/jsi18n/"></script>
-<script type="text/javascript">
-	window.__admin_media_prefix__ = "{% filter escapejs %}{% static "admin/" %}{% endfilter %}";
-	var django = {"jQuery": jQuery};
-</script>
-<script type="text/javascript" src="{% static "admin/js/core.js" %}"></script>
-{{search_form.media}}
 {% endblock %}
-- 
cgit v1.2.3-54-g00ecf


From e3837b5a872b6203b7ae338bc8075b339e031627 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 16 Feb 2013 15:23:49 -0600
Subject: Remove configurable pagination for package search

Switch it to a hardcoded value of 100 for all searches instead. It
didn't make much sense having a page number be part of the URL and a
limit value being part of the query string.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 packages/views/search.py       | 38 +-------------------------------------
 templates/packages/search.html |  3 ---
 2 files changed, 1 insertion(+), 40 deletions(-)

(limited to 'templates/packages/search.html')

diff --git a/packages/views/search.py b/packages/views/search.py
index 9cb5f38d..9ca299f6 100644
--- a/packages/views/search.py
+++ b/packages/views/search.py
@@ -1,6 +1,4 @@
-from datetime import datetime
 import json
-from pytz import utc
 
 from django import forms
 from django.contrib.auth.models import User
@@ -14,26 +12,6 @@
 from ..utils import attach_maintainers, PackageJSONEncoder
 
 
-def coerce_limit_value(value):
-    if not value:
-        return None
-    if value == 'all':
-        # negative value indicates show all results
-        return -1
-    value = int(value)
-    if value < 0:
-        raise ValueError
-    return value
-
-class LimitTypedChoiceField(forms.TypedChoiceField):
-    def valid_value(self, value):
-        try:
-            coerce_limit_value(value)
-            return True
-        except (ValueError, TypeError):
-            return False
-
-
 class PackageSearchForm(forms.Form):
     repo = forms.MultipleChoiceField(required=False)
     arch = forms.MultipleChoiceField(required=False)
@@ -46,11 +24,6 @@ class PackageSearchForm(forms.Form):
     flagged = forms.ChoiceField(
             choices=[('', 'All')] + make_choice(['Flagged', 'Not Flagged']),
             required=False)
-    limit = LimitTypedChoiceField(
-            choices=make_choice([50, 100, 250]) + [('all', 'All')],
-            coerce=coerce_limit_value,
-            required=False,
-            initial=50)
 
     def __init__(self, *args, **kwargs):
         show_staging = kwargs.pop('show_staging', False)
@@ -119,6 +92,7 @@ def parse_form(form, packages):
 
 class SearchListView(ListView):
     template_name = "packages/search.html"
+    paginate_by = 100
 
     sort_fields = ("arch", "repo", "pkgname", "pkgbase", "compressed_size",
             "installed_size", "build_date", "last_update", "flag_date")
@@ -145,16 +119,6 @@ def get_queryset(self):
         # Form had errors so don't return any results
         return Package.objects.none()
 
-    def get_paginate_by(self, queryset):
-        limit = 50
-        if self.form.is_valid():
-            asked_limit = self.form.cleaned_data['limit']
-            if asked_limit and asked_limit < 0:
-                limit = None
-            elif asked_limit:
-                limit = asked_limit
-        return limit
-
     def get_context_data(self, **kwargs):
         context = super(SearchListView, self).get_context_data(**kwargs)
         context['current_query'] = self.request.GET.urlencode()
diff --git a/templates/packages/search.html b/templates/packages/search.html
index a5d52d6c..bf1eecd9 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -36,9 +36,6 @@ <h3>Package Search</h3>
             <div>{{ search_form.flagged.errors }}
                 <label for="id_flagged" title="Limit results based on out-of-date status">
                     Flagged</label>{{ search_form.flagged }}</div>
-            <div>{{ search_form.limit.errors }}
-                <label for="id_limit" title="Select the number of results to display per page">
-                    Per Page</label>{{ search_form.limit }}</div>
             <div ><label>&nbsp;</label><input title="Search for packages using this criteria"
                 type="submit" value="Search" /></div>
         </fieldset>
-- 
cgit v1.2.3-54-g00ecf