Skip to content

Commit dc0832a

Browse files
committed
Chase the renaming of the areadirectors model to areadirector,
and thus the renaming of the auto-generated _set attribute. Remove the areadirectors_set() function. - Legacy-Id: 555
1 parent 0e1728e commit dc0832a

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

ietf/idtracker/models.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ def __str__(self):
8181
def active_area_choices():
8282
return [(area.area_acronym_id, area.area_acronym.acronym) for area in Area.objects.filter(status=1).select_related().order_by('acronym.acronym')]
8383
active_area_choices = staticmethod(active_area_choices)
84-
def areadirectors_set(self):
85-
return AreaDirector.objects.filter(area=self.area_acronym)
8684
class Meta:
8785
db_table = 'areas'
8886
verbose_name="area"

ietf/mailinglists/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,15 @@ def process_step(self, request, form, step):
9797
self.form_list.append(forms.form_for_instance(NonWgMailingList.objects.get(pk=form.clean_data['list_id']), formfield_callback=nonwg_callback))
9898
elif form.clean_data['add_edit'] == 'delete':
9999
list = NonWgMailingList.objects.get(pk=form.clean_data['list_id_delete'])
100-
self.form_list.append(gen_approval([ad.person_id for ad in list.area.areadirectors_set()], DeletionPickApprover))
100+
self.form_list.append(gen_approval([ad.person_id for ad in list.area.areadirector_set.all()], DeletionPickApprover))
101101
self.form_list.append(Preview)
102102
else:
103103
self.clean_forms.append(form)
104104
if step == 1:
105105
form0 = self.clean_forms[0]
106106
add_edit = form0.clean_data['add_edit']
107107
if add_edit == 'add' or add_edit == 'edit':
108-
self.form_list.append(gen_approval([ad.person_id for ad in Area.objects.get(area_acronym=form.clean_data['area']).areadirectors_set()], PickApprover))
108+
self.form_list.append(gen_approval([ad.person_id for ad in Area.objects.get(area_acronym=form.clean_data['area']).areadirector_set.all()], PickApprover))
109109
self.form_list.append(Preview)
110110
super(NonWgWizard, self).process_step(request, form, step)
111111
def done(self, request, form_list):

0 commit comments

Comments
 (0)