Removed the notion of an incumbent. Fixes #1771.

- Legacy-Id: 10522

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',)
 
 

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)

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()
 

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())
 

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",

ietf/templates/nomcom/list_positions.html

@@ -18,8 +18,6 @@
       <dl class="dl-horizontal">
         <dt>Description</dt>
         <dd>{{ position.description }}</dd>
-        <dt>Incumbent</dt>
-        <dd>{% if position.incumbent %}{{ position.incumbent.person }} &lt;{{ position.incumbent.address }}&gt;{% else %}None{% endif %}</dd>
         <dt>Is open</dt>
         <dd>{{ position.is_open }}</dd>
         <dt>Templates</dt>

ietf/templates/nomcom/remove_position.html

@@ -10,8 +10,6 @@
   <dl>
     <dt>Description:</dt>
     <dd>{{ position.description }}</dd>
-    <dt>Incumbent:</dt>
-    <dd>{{ position.incumbent }}</dd>
     <dt>Is open:</dt>
     <dd>{{ position.is_open }}</dd>
   </dl>