Skip to content

Commit 136bce8

Browse files
committed
Add RG in the search popup. Change to use Django Q object. fixed issue ietf-tools#1355. Commit ready for merge
- Legacy-Id: 8617
1 parent f5a0cd0 commit 136bce8

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

ietf/ipr/search.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
from django.shortcuts import render_to_response as render
99
from django.template import RequestContext
1010
from django.conf import settings
11+
from django.db.models import Q
12+
1113

1214
from ietf.ipr.models import IprDocAlias, IprDetail
1315
from ietf.ipr.related import related_docs
1416
from ietf.utils.draft_search import normalize_draftname
1517
from ietf.group.models import Group
1618
from ietf.doc.models import DocAlias
1719

18-
from itertools import chain
19-
2020

2121
def iprs_from_docs(docs):
2222
iprs = []
@@ -43,9 +43,7 @@ def patent_file_search(url, q):
4343
return False
4444

4545
def search(request):
46-
wgs = Group.objects.filter(type="wg").select_related().order_by("acronym")
47-
rgs = Group.objects.filter(type="rg").select_related().order_by("acronym")
48-
wgs = chain(wgs,rgs)
46+
wgs = Group.objects.filter(Q(type="wg") | Q(type="rg")).select_related().order_by("acronym")
4947

5048
search_type = request.GET.get("option")
5149
if search_type:

0 commit comments

Comments
 (0)