Minor refactoring (cleaner access to list of active areas)

 - Legacy-Id: 2033

Author: pasieronen

ietf/idrfc/templatetags/wg_menu.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,7 @@
 from django import template
 from django.core.cache import cache
 from django.template import loader
-from ietf.idtracker.models import IETFWG, Area
+from ietf.idtracker.models import Area
 
 register = template.Library()
 
@@ -42,23 +42,14 @@
     'rai':'RAI'
     }
 
-def get_wgs():
-    wgs = IETFWG.objects.filter(group_type__type='WG').filter(status__status='Active').select_related().order_by('acronym.acronym')
-    areas = []
-    for a in Area.objects.filter(status__status='Active').select_related().order_by('acronym.acronym'):
-        wglist = []
-        for w in wgs:
-            if w.area.area == a:
-                wglist.append(w)
-        if len(wglist) > 0:
-            if a.area_acronym.acronym in area_short_names:
-                area_name = area_short_names[a.area_acronym.acronym]
-            else:
-                area_name = a.area_acronym.name
-                if area_name.endswith(" Area"):
-                    area_name = area_name[:-5]
-            areas.append({'areaAcronym':a.area_acronym.acronym, 'areaName':area_name, 'areaObj':a, 'wgs':wglist})
-    return areas
+def get_short_name(area):
+    if area.area_acronym.acronym in area_short_names:
+        return area_short_names[area.area_acronym.acronym]
+    else:
+        area_name = area.area_acronym.name
+        if area_name.endswith(" Area"):
+            area_name = area_name[:-5]
+        return area_name
 
 class WgMenuNode(template.Node):
     def __init__(self):
@@ -67,7 +58,7 @@ def render(self, context):
         x = cache.get('idrfc_wgmenu')
         if x:
             return x
-        areas = get_wgs()
+        areas = [{'area':x, 'short_name':get_short_name(x)} for x in Area.active_areas()]
         x = loader.render_to_string('idrfc/base_wgmenu.html', {'areas':areas})
         cache.set('idrfc_wgmenu', x, 30*60)
         return x

ietf/idrfc/views_search.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@ class SearchForm(forms.Form):
     oldDrafts = forms.BooleanField(required=False,initial=False)
 
     group = forms.CharField(required=False)
-    area = forms.ModelChoiceField(Area.objects.filter(status=Area.ACTIVE), empty_label="any area", required=False)
+    area = forms.ModelChoiceField(Area.active_areas(), empty_label="any area", required=False)
 
     ad = forms.ChoiceField(choices=(), required=False)
     state = forms.ModelChoiceField(IDState.objects.all(), empty_label="any state", required=False)

ietf/idtracker/forms.py

@@ -7,7 +7,7 @@ class IDSearch(forms.Form):
     search_job_owner = forms.ChoiceField(choices=(), required=False)
     search_group_acronym = forms.CharField(widget=forms.TextInput(attrs={'size': 7, 'maxlength': 10}), required=False)
     search_status_id = forms.ModelChoiceField(IDStatus.objects.all(), empty_label="--All", required=False)
-    search_area_acronym = forms.ModelChoiceField(Area.objects.filter(status=Area.ACTIVE), empty_label="--All/Any", required=False)
+    search_area_acronym = forms.ModelChoiceField(Area.active_areas(), empty_label="--All/Any", required=False)
     search_cur_state = forms.ModelChoiceField(IDState.objects.all(), empty_label="--All/Any", required=False)
     sub_state_id = forms.ChoiceField(choices=(), required=False)
     search_filename = forms.CharField(widget=forms.TextInput(attrs={'size': 15, 'maxlength': 60}), required=False)

ietf/idtracker/models.py

@@ -87,9 +87,9 @@ def __str__(self):
 	return self.area_acronym.acronym
     def active_wgs(self):
         return IETFWG.objects.filter(group_type=1,status=IETFWG.ACTIVE,areagroup__area=self).order_by('group_acronym__acronym')
-    def active_area_choices():
-	return [(area.area_acronym_id, area.area_acronym.acronym) for area in Area.objects.filter(status=1).select_related().order_by('acronym.acronym')]
-    active_area_choices = staticmethod(active_area_choices)
+    def active_areas():
+        return Area.objects.filter(status=Area.ACTIVE).order_by('area_acronym__acronym')
+    active_areas = staticmethod(active_areas)
     class Meta:
         db_table = 'areas'
 	verbose_name="area"

ietf/templates/idrfc/base_wgmenu.html

@@ -32,7 +32,9 @@
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 {% endcomment %}
 {% for area in areas %}
-<li class="yuimenuitem"><a class="yuimenuitemlabel">{{area.areaName|escape }}</a><div id="wgs-{{area.areaAcronym}}" class="yuimenu"><div class="bd"><ul>{% for wg in area.wgs %}
-<li class="yuimenuitem"><a class="yuimenuitemlabel" href="http://tools.ietf.org/wg/{{wg.group_acronym}}/">{{wg.group_acronym}} &mdash; {{wg.group_acronym.name|escape}}</a></li>{% endfor %}
+{% if area.area.active_wgs %}
+<li class="yuimenuitem"><a class="yuimenuitemlabel">{{area.short_name }}</a><div id="wgs-{{area.area.area_acronym}}" class="yuimenu"><div class="bd"><ul>{% for wg in area.area.active_wgs %}
+<li class="yuimenuitem"><a class="yuimenuitemlabel" href="http://tools.ietf.org/wg/{{wg.group_acronym}}/">{{wg.group_acronym}} &mdash; {{wg.group_acronym.name}}</a></li>{% endfor %}
 </ul></div></div></li>
+{% endif %}
 {% endfor %}

ietf/wginfo/views.py

@@ -38,16 +38,16 @@
 from django.http import HttpResponse
 
 def wg_summary_acronym(request):
-    areas = Area.objects.filter(status='1')
-    wgs = IETFWG.objects.filter(status='1')
+    areas = Area.active_areas()
+    wgs = IETFWG.objects.filter(status=IETFWG.ACTIVE)
     return HttpResponse(loader.render_to_string('wginfo/summary-by-acronym.txt', {'area_list': areas, 'wg_list': wgs}),mimetype='text/plain; charset=UTF-8')
 
 def wg_summary_area(request):
     wgs = IETFWG.objects.filter(status='1',start_date__isnull=False)
     return HttpResponse(loader.render_to_string('wginfo/summary-by-area.txt', {'wg_list': wgs}),mimetype='text/plain; charset=UTF-8')
 
 def wg_dir(request):
-    areas = Area.objects.filter(status__status='Active')
+    areas = Area.active_areas()
     return render_to_response('wginfo/wg-dir.html', {'areas':areas}, RequestContext(request))
 
 def collect_wg_info(acronym):