[spalenque] - #13187 * fix sangria survey count and default language

Author: santipalenque

survey_builder/code/infrastructure/repositories/SapphireSurveyRepository.php

@@ -67,8 +67,11 @@ public function getByTemplateAndAnswerValue($template_id, $question_id , array $
 
         $question_values_condition = "";
         foreach($values as $question_val){
-            if(!empty($question_values_condition)) $question_values_condition .= " OR ";
-            $question_values_condition .= "SurveyAnswer.Value LIKE '%{$question_val}%' ";
+            if(!empty($question_values_condition))
+                $question_values_condition .= " OR ";
+
+            if ($question_val)
+                $question_values_condition .= "SurveyAnswer.Value LIKE '%{$question_val}%' ";
         }
 
         if(!empty($question_values_condition)) $question_values_condition = "AND ({$question_values_condition})";

survey_builder/code/ui/admin/sangria/SangriaSurveyBuilderExtension.php

@@ -202,7 +202,7 @@ private function buildList
         $question_value         = !empty($question_text_value) ? $question_text_value: $question_select_values;
         $order                  = Convert::raw2sql($request->getVar('order'));
         $page_size              = Convert::raw2sql($request->getVar('page_size'));
-        $survey_lang            = Convert::raw2sql($request->getVar('survey_lang'));
+        $survey_lang            = ($request->getVar('survey_lang')) ? Convert::raw2sql($request->getVar('survey_lang')) : 'ALL';
 
         if(empty($page_size)) $page_size = 25;
         if($page_size == "ALL") $page_size = PHP_INT_MAX;