diff --git a/ietf/nomcom/admin.py b/ietf/nomcom/admin.py index 1c8b35d9f..21a4b59d9 100644 --- a/ietf/nomcom/admin.py +++ b/ietf/nomcom/admin.py @@ -23,7 +23,7 @@ class NomineePositionAdmin(admin.ModelAdmin): class PositionAdmin(admin.ModelAdmin): - list_display = ('name', 'nomcom', 'is_open', 'incumbent') + list_display = ('name', 'nomcom', 'is_open') list_filter = ('nomcom',) diff --git a/ietf/nomcom/forms.py b/ietf/nomcom/forms.py index e86304b32..d87caf8f9 100644 --- a/ietf/nomcom/forms.py +++ b/ietf/nomcom/forms.py @@ -566,14 +566,13 @@ class NomComTemplateForm(BaseNomcomForm, DBTemplateForm): class PositionForm(BaseNomcomForm, forms.ModelForm): - fieldsets = [('Position', ('name', 'description', - 'is_open', 'incumbent'))] + fieldsets = [('Position', ('name', 'description', 'is_open' ))] incumbent = SearchableEmailField(required=False) class Meta: model = Position - fields = ('name', 'description', 'is_open', 'incumbent') + fields = ('name', 'description', 'is_open') def __init__(self, *args, **kwargs): self.nomcom = kwargs.pop('nomcom', None) diff --git a/ietf/nomcom/models.py b/ietf/nomcom/models.py index 36c295086..837cd3892 100644 --- a/ietf/nomcom/models.py +++ b/ietf/nomcom/models.py @@ -163,7 +163,6 @@ class Position(models.Model): requirement = models.ForeignKey(DBTemplate, related_name='requirement', null=True, editable=False) questionnaire = models.ForeignKey(DBTemplate, related_name='questionnaire', null=True, editable=False) is_open = models.BooleanField(verbose_name='Is open', default=False) - incumbent = models.ForeignKey(Email, null=True, blank=True) objects = PositionManager() diff --git a/ietf/nomcom/resources.py b/ietf/nomcom/resources.py index 61d10a2f0..0e21f32e0 100644 --- a/ietf/nomcom/resources.py +++ b/ietf/nomcom/resources.py @@ -25,13 +25,11 @@ class NomComResource(ModelResource): } api.nomcom.register(NomComResource()) -from ietf.person.resources import EmailResource from ietf.dbtemplate.resources import DBTemplateResource class PositionResource(ModelResource): nomcom = ToOneField(NomComResource, 'nomcom') requirement = ToOneField(DBTemplateResource, 'requirement', null=True) questionnaire = ToOneField(DBTemplateResource, 'questionnaire', null=True) - incumbent = ToOneField(EmailResource, 'incumbent', null=True) class Meta: queryset = Position.objects.all() serializer = api.Serializer() @@ -44,7 +42,6 @@ class PositionResource(ModelResource): "nomcom": ALL_WITH_RELATIONS, "requirement": ALL_WITH_RELATIONS, "questionnaire": ALL_WITH_RELATIONS, - "incumbent": ALL_WITH_RELATIONS, } api.nomcom.register(PositionResource()) diff --git a/ietf/nomcom/test_data.py b/ietf/nomcom/test_data.py index 11f1956f3..f680809dc 100644 --- a/ietf/nomcom/test_data.py +++ b/ietf/nomcom/test_data.py @@ -131,8 +131,7 @@ def nomcom_test_data(): position, created = Position.objects.get_or_create(nomcom=nomcom, name=name, description=description, - is_open=True, - incumbent=email) + is_open=True) ChangeStateGroupEvent.objects.get_or_create(group=group, type="changed_state", diff --git a/ietf/templates/nomcom/list_positions.html b/ietf/templates/nomcom/list_positions.html index 0ee7d5908..b0106e9be 100644 --- a/ietf/templates/nomcom/list_positions.html +++ b/ietf/templates/nomcom/list_positions.html @@ -18,8 +18,6 @@