Skip to content

Commit b6fc058

Browse files
committed
Merged in [8617] from liudapeng@chinamobile.com:
Add RG in the search popup. Change to use Django Q object. Fixes issue ietf-tools#1355. - Legacy-Id: 8625 Note: SVN reference [8617] has been migrated to Git commit 136bce8
2 parents 334d118 + 136bce8 commit b6fc058

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

ietf/ipr/search.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@
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

20+
1821
def iprs_from_docs(docs):
1922
iprs = []
2023
for doc in docs:
@@ -40,7 +43,7 @@ def patent_file_search(url, q):
4043
return False
4144

4245
def search(request):
43-
wgs = Group.objects.filter(type="wg").select_related().order_by("acronym")
46+
wgs = Group.objects.filter(Q(type="wg") | Q(type="rg")).select_related().order_by("acronym")
4447

4548
search_type = request.GET.get("option")
4649
if search_type:

0 commit comments

Comments
 (0)