Changes to the rule specifications for document tracking lists: Simplify the filter rules, show acronym in wg and area selection lists, list only ADs of active areas.

 - Legacy-Id: 4527

Author: levkowetz

ietf/community/rules.py

@@ -31,10 +31,10 @@ class WgAsociatedRule(RuleManager):
     description = 'All I-Ds associated with a particular WG'
 
     def get_documents(self):
-        return Document.objects.filter(Q(type__name='Draft') | Q(states__name='rfc')).filter(group__acronym=self.value).distinct()
+        return Document.objects.filter(type='draft').filter(group__acronym=self.value).distinct()
 
     def options(self):
-        return [(i.acronym, i.name) for i in Group.objects.filter(type='wg', state='active').distinct().order_by('name')]
+        return [(i.acronym, "%s — %s"%(i.acronym, i.name)) for i in Group.objects.filter(type='wg', state='active').distinct().order_by('name')]
 
     def show_value(self):
         try:
@@ -48,10 +48,10 @@ class AreaAsociatedRule(RuleManager):
     description = 'All I-Ds associated with all WGs in a particular Area'
 
     def get_documents(self):
-        return Document.objects.filter(Q(type__name='Draft') | Q(states__name='rfc')).filter(group__parent__acronym=self.value, group__parent__type='area').distinct()
+        return Document.objects.filter(type='draft').filter(group__parent__acronym=self.value, group__parent__type='area').distinct()
 
     def options(self):
-        return [(i.acronym, i.name) for i in Group.objects.filter(type='area', state='active').distinct().order_by('name')]
+        return [(i.acronym, "%s — %s"%(i.acronym, i.name)) for i in Group.objects.filter(type='area', state='active').distinct().order_by('name')]
 
     def show_value(self):
         try:
@@ -65,10 +65,10 @@ class AdResponsibleRule(RuleManager):
     description = 'All I-Ds with a particular responsible AD'
 
     def get_documents(self):
-        return Document.objects.filter(Q(type__name='Draft') | Q(states__name='rfc')).filter(ad=self.value).distinct()
+        return Document.objects.filter(type='draft').filter(ad=self.value).distinct()
 
     def options(self):
-        return [(i.pk, i.name) for i in Person.objects.filter(role__name='ad').distinct().order_by('name')]
+        return [(i.pk, i.name) for i in Person.objects.filter(role__name='ad',group__state='active').distinct().order_by('name')]
 
     def show_value(self):
         try:
@@ -82,39 +82,39 @@ class AuthorRule(RuleManager):
     description = 'All I-Ds with a particular author'
 
     def get_documents(self):
-        return Document.objects.filter(Q(type__name='Draft') | Q(states__name='rfc')).filter(authors__person__name__icontains=self.value).distinct()
+        return Document.objects.filter(type='draft').filter(authors__person__name__icontains=self.value).distinct()
 
 
 class ShepherdRule(RuleManager):
     codename = 'shepherd'
     description = 'All I-Ds with a particular document shepherd'
 
     def get_documents(self):
-        return Document.objects.filter(Q(type__name='Draft') | Q(states__name='rfc')).filter(shepherd__name__icontains=self.value).distinct()
+        return Document.objects.filter(type='draft').filter(shepherd__name__icontains=self.value).distinct()
 
 
 class ReferenceToRFCRule(RuleManager):
     codename = 'reference_to_rfc'
     description = 'All I-Ds that have a reference to a particular RFC'
 
     def get_documents(self):
-        return Document.objects.filter(Q(type__name='Draft') | Q(states__name='rfc')).filter(relateddocument__target__document__states__name='rfc', relateddocument__target__document__name__icontains=self.value).distinct()
+        return Document.objects.filter(type='draft').filter(relateddocument__target__document__states='rfc', relateddocument__target__document__name__icontains=self.value).distinct()
 
 
 class ReferenceToIDRule(RuleManager):
     codename = 'reference_to_id'
     description = 'All I-Ds that have a reference to a particular I-D'
 
     def get_documents(self):
-        return Document.objects.filter(Q(type__name='Draft') | Q(states__name='rfc')).filter(relateddocument__target__document__type__name='Draft', relateddocument__target__document__name__icontains=self.value).distinct()
+        return Document.objects.filter(type='draft').filter(relateddocument__target__document__type='draft', relateddocument__target__document__name__icontains=self.value).distinct()
 
 
 class ReferenceFromRFCRule(RuleManager):
     codename = 'reference_from_rfc'
     description = 'All I-Ds that are referenced by a particular RFC'
 
     def get_documents(self):
-        return Document.objects.filter(Q(type__name='Draft') | Q(states__name='rfc')).filter(relateddocument__source__states__name='rfc', relateddocument__source__name__icontains=self.value).distinct()
+        return Document.objects.filter(type='draft').filter(relateddocument__source__states='rfc', relateddocument__source__name__icontains=self.value).distinct()
 
 
 
@@ -123,15 +123,15 @@ class ReferenceFromIDRule(RuleManager):
     description = 'All I-Ds that are referenced by a particular I-D'
 
     def get_documents(self):
-        return Document.objects.filter(Q(type__name='Draft') | Q(states__name='rfc')).filter(relateddocument__source__type__name='Draft', relateddocument__source__name__icontains=self.value).distinct()
+        return Document.objects.filter(type='draft').filter(relateddocument__source__type='draft', relateddocument__source__name__icontains=self.value).distinct()
 
 
 class WithTextRule(RuleManager):
     codename = 'with_text'
     description = 'All I-Ds that contain a particular text string in the name'
 
     def get_documents(self):
-        return Document.objects.filter(type__name='Draft').filter(name__icontains=self.value).distinct()
+        return Document.objects.filter(type='draft').filter(name__icontains=self.value).distinct()
 
 
 TYPES_OF_RULES = [(i.codename, i.description) for i in RuleManager.__subclasses__()]