altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Change the idindex search to use GET to allow bookmarking searches.

Browse source 
Use request.REQUEST to allow backwards-compatible searching.
 - Legacy-Id: 486
This commit is contained in:
Bill Fenner 2007-06-18 14:24:56 +00:00
parent a6c5f1b805
commit 7fa51e03cd
2 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
ietf/idindex/views.py
View file

@ -96,21 +96,30 @@ def showdocs(request, cat=None, sortby=None):
def search(request): def search(request):
form = IDIndexSearchForm() form = IDIndexSearchForm()
t = loader.get_template('idindex/search.html') t = loader.get_template('idindex/search.html')
# if there's a post, do the search and supply results to the template # if there's a query, do the search and supply results to the template
# XXX should handle GET too searching = False
if request.method == 'POST': qdict = { 'filename': 'filename__icontains',
qdict = { 'filename': 'filename__icontains', 'id_tracker_state_id': 'idinternal__cur_state',
'id_tracker_state_id': 'idinternal__cur_state', 'wg_id': 'group',
'wg_id': 'group', 'status_id': 'status',
'status_id': 'status', 'last_name': 'authors__person__last_name__icontains',
'last_name': 'authors__person__last_name__icontains', 'first_name': 'authors__person__first_name__icontains',
'first_name': 'authors__person__first_name__icontains', }
} for key in qdict.keys() + ['other_group']:
q_objs = [Q(**{qdict[k]: request.POST[k]}) if key in request.REQUEST:
searching = True
if searching:
# '0' and '-1' are flag values for "any"
# in the original .cgi search page.
# They are compared as strings because the
# query dict is always strings.
q_objs = [Q(**{qdict[k]: request.REQUEST[k]})
for k in qdict.keys() for k in qdict.keys()
if request.POST[k] != ''] if request.REQUEST.get(k, '') != '' and
request.REQUEST[k] != '0' and
request.REQUEST[k] != '-1']
try: try:
other = orgs_dict[request.POST['other_group']] other = orgs_dict[request.REQUEST['other_group']]
q_objs += [orl( q_objs += [orl(
[Q(filename__istartswith="draft-%s-" % p)| [Q(filename__istartswith="draft-%s-" % p)|
Q(filename__istartswith="draft-ietf-%s-" % p) Q(filename__istartswith="draft-ietf-%s-" % p)

2
ietf/templates/idindex/search.html
View file

@ -13,7 +13,7 @@
{% else %} {% else %}
<center> <center>
<h2>I-D Search</h2> <h2>I-D Search</h2>
<form action="" method="POST"> <form action="." method="GET">
<table cellpadding="1" cellspacing="1" border="0" bgcolor="#9999ff"> <table cellpadding="1" cellspacing="1" border="0" bgcolor="#9999ff">
<tr><td> <tr><td>
<table cellpadding="2" cellspacing="1" border="0" bgcolor="#ffffff"> <table cellpadding="2" cellspacing="1" border="0" bgcolor="#ffffff">