Use QuestionOption.question.name when fetching location_type question

cadasta/spatial/models.py

@@ -293,6 +293,7 @@ def set_label_on_spatialunits(sender, instance, **kwargs):
     try:
         rel_questionoption = QuestionOption.objects.get(
             name=instance.type,
+            question__name='location_type',
             question__questionnaire__id=instance.project.current_questionnaire)
     except QuestionOption.DoesNotExist:
         return

cadasta/spatial/tests/test_models.py

@@ -123,7 +123,7 @@ def test_location_type_label_standard(self):
         su = SpatialUnitFactory.create(type="RW")
         assert su.location_type_label == "Right-of-way"
 
-    def test_location_type_label_questionnaire_default_lang(self):
+    def test_location_type_label_standard(self):
         questionnaire = q_factories.QuestionnaireFactory.create(
             default_language='en')
         question = q_factories.QuestionFactory.create(
@@ -136,6 +136,30 @@ def test_location_type_label_questionnaire_default_lang(self):
             name='HOUSE',
             label={'en': 'House', 'de': 'Hause'}
         )
+
+    def test_location_type_label_uses_correct_question_option(self):
+        """
+        Ensure that the label setter pre_save signal fetches the correct
+        question option.
+        """
+        questionnaire = q_factories.QuestionnaireFactory.create(
+            default_language='en')
+        location_question = q_factories.QuestionFactory.create(
+            questionnaire=questionnaire,
+            name='location_type',
+            type='S1'
+        )
+        other_question = q_factories.QuestionFactory.create(
+            questionnaire=questionnaire,
+            name='least_favorite_music_genre',
+            type='S1'
+        )
+        for q in (location_question, other_question):
+            q_factories.QuestionOptionFactory.create(
+                question=q,
+                name='HOUSE',
+                label={'en': 'House', 'de': 'Hause'}
+            )
         su = SpatialUnitFactory.create(
             project=questionnaire.project,
             type='HOUSE')