Attempting to fix the template rendering

openassessment/templates/openassessmentblock/edit/oa_edit.html

@@ -58,13 +58,19 @@
                 {% trans "Select the steps that students must complete. All steps are optional, but every assignment must include at least one step. To change the order in which students will complete the steps, drag them into the desired order." %}
             </p>
             <ol id="openassessment_assessment_module_settings_editors">
-                {% include "openassessmentblock/edit/oa_edit_training.html"  %}
 
-                {% include "openassessmentblock/edit/oa_edit_peer.html"  %}
+                {% for assessment in used_assessments %}
+                    {% with "openassessmentblock/edit/oa_edit_"|add:assessment|add:".html" as template %}
+                    {% include template %}
+                    {% endwith %}
+                {% endfor %}
 
-                {% include "openassessmentblock/edit/oa_edit_self.html"  %}
+                {% for assessment in unused_assessments %}
+                    {% with "openassessmentblock/edit/oa_edit_"|add:assessment|add:".html" as template %}
+                    {% include template %}
+                    {% endwith %}
+                {% endfor %}
 
-                {% include "openassessmentblock/edit/oa_edit_ai.html"  %}
             </ol>
         </div>
     </div>

openassessment/xblock/studio_mixin.py

@@ -67,12 +67,19 @@ class StudioMixin(object):
         # the openassessmentblock definition.
         # Django Templates cannot handle dict keys with dashes, so we'll convert
         # the dashes to underscores.
+
+        # used_assessments (and its unused counterpart) are lists intended to indicate
+        # the order that settings editors should be rendered.  Using lists allows a set order
+        # which django can easily convert into template names.
+        used_assessments = []
         assessments = {}
         for assessment in self.rubric_assessments:
-            name = assessment['name']
-            assessments[name.replace('-', '_')] = copy.deepcopy(
-                assessment
-            )
+            name = assessment['name'].replace('-', '_')
+            used_assessments.append(name)
+            assessments[name] = copy.deepcopy(assessment)
+
+        unused_assessments = {'student_training', 'peer_assessment', 'self_assessment', 'example_based_assessment'}
+        unused_assessments = unused_assessments - set(used_assessments)
 
         student_training_module = self.get_assessment_module(
             'student-training'
@@ -108,6 +115,8 @@ class StudioMixin(object):
             'assessments': assessments,
             'criteria': criteria,
             'feedbackprompt': unicode(self.rubric_feedback_prompt),
+            'unused_assessments': unused_assessments,
+            'used_assessments': used_assessments
         }
 
     @XBlock.json_handler