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

Merged in [15012] from ford@isoc.org:

Browse source 
Add IRTF State option to Additional Search Criteria pulldown.
 - Legacy-Id: 15016
Note: SVN reference [15012] has been migrated to Git commit cd912600e6
This commit is contained in:
Henrik Levkowetz 2018-04-05 14:50:40 +00:00
parent 18572cb536 cd912600e6
commit 6a32a363cc
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ietf/doc/views_search.py
View file

@ -64,7 +64,7 @@ class SearchForm(forms.Form):
activedrafts = forms.BooleanField(required=False, initial=True) activedrafts = forms.BooleanField(required=False, initial=True)
olddrafts = forms.BooleanField(required=False, initial=False) olddrafts = forms.BooleanField(required=False, initial=False)
by = forms.ChoiceField(choices=[(x,x) for x in ('author','group','area','ad','state','stream')], required=False, initial='group') by = forms.ChoiceField(choices=[(x,x) for x in ('author','group','area','ad','state','irtfstate','stream')], required=False, initial='group')
author = forms.CharField(required=False) author = forms.CharField(required=False)
group = forms.CharField(required=False) group = forms.CharField(required=False)
stream = forms.ModelChoiceField(StreamName.objects.all().order_by('name'), empty_label="any stream", required=False) stream = forms.ModelChoiceField(StreamName.objects.all().order_by('name'), empty_label="any stream", required=False)
@ -72,6 +72,7 @@ class SearchForm(forms.Form):
ad = forms.ChoiceField(choices=(), required=False) ad = forms.ChoiceField(choices=(), required=False)
state = forms.ModelChoiceField(State.objects.filter(type="draft-iesg"), empty_label="any state", required=False) state = forms.ModelChoiceField(State.objects.filter(type="draft-iesg"), empty_label="any state", required=False)
substate = forms.ChoiceField(choices=(), required=False) substate = forms.ChoiceField(choices=(), required=False)
irtfstate = forms.ModelChoiceField(State.objects.filter(type="draft-stream-irtf"), empty_label="any state", required=False)
sort = forms.ChoiceField( sort = forms.ChoiceField(
choices= ( choices= (
@ -111,7 +112,9 @@ class SearchForm(forms.Form):
for k in ('author', 'group', 'area', 'ad'): for k in ('author', 'group', 'area', 'ad'):
if q['by'] == k and not q.get(k): if q['by'] == k and not q.get(k):
q['by'] = None q['by'] = None
if q['by'] == 'state' and not (q.get("state") or q.get('substate')): if q['by'] == 'state' and not (q.get('state') or q.get('substate')):
q['by'] = None
if q['by'] == 'irtfstate' and not (q.get('irtfstate')):
q['by'] = None q['by'] = None
else: else:
q['by'] = None q['by'] = None
@ -121,6 +124,8 @@ class SearchForm(forms.Form):
q[k] = "" q[k] = ""
if q['by'] != 'state': if q['by'] != 'state':
q['state'] = q['substate'] = None q['state'] = q['substate'] = None
if q['by'] != 'irtfstate':
q['irtfstate'] = None
return q return q
def retrieve_search_results(form, all_types=False): def retrieve_search_results(form, all_types=False):
@ -183,6 +188,8 @@ def retrieve_search_results(form, all_types=False):
docs = docs.filter(states=query["state"]) docs = docs.filter(states=query["state"])
if query["substate"]: if query["substate"]:
docs = docs.filter(tags=query["substate"]) docs = docs.filter(tags=query["substate"])
elif by == "irtfstate":
docs = docs.filter(states=query["irtfstate"])
elif by == "stream": elif by == "stream":
docs = docs.filter(stream=query["stream"]) docs = docs.filter(stream=query["stream"])

10
ietf/templates/doc/search/search_form.html
View file

@ -106,6 +106,16 @@
</div> </div>
</div> </div>
<div class="form-group search_field">
<div class="col-sm-4">
<input type="radio" name="by" value="irtfstate" {% if form.by.value == "irtfstate" %}checked{% endif %} id="irtfstate"/>
<label for="irtfstate" class="control-label">IRTF State</label>
</div>
<div class="col-sm-8">
{{ form.irtfstate|add_class:"form-control" }}
</div>
</div>
<div class="form-group search_field"> <div class="form-group search_field">
<div class="col-sm-4"> <div class="col-sm-4">
<input type="radio" name="by" value="stream" {% if form.by.value == "stream" %}checked{% endif %} id="stream"/> <input type="radio" name="by" value="stream" {% if form.by.value == "stream" %}checked{% endif %} id="stream"/>