Author: sevein
Date: Wed Dec 1 14:53:27 2010
New Revision: 48
Log:
Make staff filter an option.
Modified:
trunk/chk4upd/views.py
trunk/templates/report.html
Modified: trunk/chk4upd/views.py
==============================================================================
--- trunk/chk4upd/views.py Wed Dec 1 13:51:40 2010 (r47)
+++ trunk/chk4upd/views.py Wed Dec 1 14:53:27 2010 (r48)
@@ -59,25 +59,30 @@
import datetime
- objects = Call.objects.all().order_by('-created_at').exclude(
- address__startswith = 'http://www.ica-atom.org').exclude( # Exclude demo
site
- address__startswith = 'http://ica-atom.org').exclude( # Exclude demo
site
- httpmeta_remoteaddr = '70.71.0.109').exclude( # Exclude known
IPs
- httpmeta_remoteaddr = '91.121.171.199').exclude( # ...
- httpmeta_remoteaddr = '79.148.124.205').exclude(
- httpmeta_remoteaddr = '70.71.163.28').exclude(
- httpmeta_remoteaddr = '80.59.9.248').exclude(
- httpmeta_remoteaddr = '88.2.193.99').exclude(
- httpmeta_remoteaddr = '64.124.98.10').exclude(
- httpmeta_remoteaddr = '24.83.168.17').exclude(
- httpmeta_remoteaddr = '99.199.102.26').exclude(
- created_at__lt = datetime.date(2010, 11, 19)) # Filter items
before Nov. 19, 2010
+ objects = Call.objects.all().order_by('-created_at')
- # Filter by release
+ # Filter by release (Default: "all")
release = request.POST.get('release', 'all')
if 'all' != release:
objects = objects.filter(distribution = release)
+ # Filter "staff"
+ if 'filter_staff' in request.POST or request.method == 'GET':
+ filter_staff = True
+ objects = objects.exclude(
+ address__startswith = 'http://www.ica-atom.org').exclude( # Exclude demo
site
+ address__startswith = 'http://ica-atom.org').exclude( # Exclude demo
site
+ httpmeta_remoteaddr = '70.71.0.109').exclude( # Exclude
known IPs
+ httpmeta_remoteaddr = '91.121.171.199').exclude( # ...
+ httpmeta_remoteaddr = '79.148.124.205').exclude(
+ httpmeta_remoteaddr = '70.71.163.28').exclude(
+ httpmeta_remoteaddr = '80.59.9.248').exclude(
+ httpmeta_remoteaddr = '88.2.193.99').exclude(
+ httpmeta_remoteaddr = '64.124.98.10').exclude(
+ httpmeta_remoteaddr = '24.83.168.17').exclude(
+ httpmeta_remoteaddr = '99.199.102.26').exclude(
+ created_at__lt = datetime.date(2010, 11, 19)) # Filter items
before Nov. 19, 2010
+
paginator = Paginator(objects, 26)
try:
Modified: trunk/templates/report.html
==============================================================================
--- trunk/templates/report.html Wed Dec 1 13:51:40 2010 (r47)
+++ trunk/templates/report.html Wed Dec 1 14:53:27 2010 (r48)
@@ -24,7 +24,7 @@
$(this).toggleClass('hover');
});
- $('select[name=release]').change(function ()
+ $('select[name=release], input[name=filter_staff]').change(function ()
{
$('form').submit();
});
@@ -42,6 +42,9 @@
<option value="dcb"{% ifequal release 'dcb' %} selected="selected"{%
endifequal %}>DCB</option>
<option value="qubit"{% ifequal release 'qubit' %}
selected="selected"{% endifequal %}>Qubit-Toolkit</option>
</select>
+
+ <input type="checkbox" name="filter_staff" value="1"{% if filter_staff
%} checked="checked"{% endif %} />
+ <label for="filter_staff">Filter staff</label>
</form><br />
<table id="report">
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
