Do legible questionnaires and requirements

See #1008
 - Legacy-Id: 5690

ietf/nomcom/models.py

@@ -6,6 +6,7 @@ from django.db.models.signals import post_delete
 from django.conf import settings
 from django.core.files.storage import FileSystemStorage
 from django.contrib.auth.models import User
+from django.template.loader import render_to_string
 
 from south.modelsinspector import add_introspection_rules
 
@@ -169,6 +170,12 @@ class Position(models.Model):
         self._templates = DBTemplate.objects.filter(group=self.nomcom.group).filter(path__contains='/%s/position/' % self.id).order_by('title')
         return self._templates
 
+    def get_questionnaire(self):
+        return render_to_string(self.questionnaire.path, {'position': self})
+
+    def get_requirement(self):
+        return render_to_string(self.requirement.path, {'position': self})
+
 
 class Feedback(models.Model):
     nomcom = models.ForeignKey('NomCom')

ietf/templates/nomcom/questionnaires.html

@@ -22,8 +22,7 @@
     {% for position in positions %}
       <div id="{{ position.name }}">
           <h3>{{ position.description }}</h3>
-          {{ position.description }}
-          {% include position.questionnaire.path %}
+          {{ position.get_questionnaire|linebreaks}}
       </div>
     {% endfor %}
   </div>

ietf/templates/nomcom/requirements.html

@@ -22,7 +22,7 @@
     {% for position in positions %}
       <div id="{{ position.name }}">
           <h3>{{ position.description }}</h3>
-          {% include position.requirement.path %}
+          {{ position.get_requirement|linebreaks}}
       </div>
     {% endfor %}
   </div>