removed pagination for PollsViaSurveys

molo/surveys/models.py

@@ -112,6 +112,7 @@ class MoloSurveyPage(
     introduction = TextField(blank=True)
     homepage_introduction = TextField(blank=True)
     image = models.ForeignKey(
+
         'wagtailimages.Image',
         null=True,
         blank=True,
@@ -388,7 +389,8 @@ def serve(self, request, *args, **kwargs):
                 self.has_user_submitted_survey(request, self.id)):
             return render(request, self.template, self.get_context(request))
 
-        if self.has_page_breaks or self.multi_step:
+        if ((self.has_page_breaks or self.multi_step) and
+                not self.display_survey_directly):
             return self.serve_questions(request)
 
         if request.method == 'POST':

molo/surveys/tests/test_models.py

@@ -510,7 +510,7 @@ def setUp(self):
 
     def test_molo_survey_poll(self):
         survey = MoloSurveyPage(
-            title='Molo Survey Poll ',
+            title='Molo Survey Poll',
             slug="molo-survey-poll",
             introduction='Introduction to Test Survey ...',
             allow_anonymous_submissions=True,
@@ -572,4 +572,4 @@ def test_personalisable_survey_poll(self):
             follow=True,
         )
         self.assertContains(response, survey.thank_you_text)
-        self.assertNotContains(response, 'That page number is less than 1')
+        self.assertNotContains(response, 'That page number is less than 1')