Dev Speed optimizations when browsing responses

LimeSurvey · Dec 12, 2013 · 709ae21 · 709ae21
1 parent 6a75d8c
commit 709ae21
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/application/controllers/admin/responses.php b/application/controllers/admin/responses.php
@@ -586,6 +586,7 @@ function browse($iSurveyID)
             $aData['end'] = $end;
             $aData['fncount'] = $fncount;
             $aData['fnames'] = $fnames;
+            $aData['bHasFileUploadQuestion'] = hasFileUploadQuestion($iSurveyID);
 
             $aViewUrls[] = 'browseallheader_view';
 

diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -2245,13 +2245,13 @@ function createFieldMap($surveyid, $style='short', $force_refresh=false, $questi
 
     $sLanguage = sanitize_languagecode($sLanguage);
     $surveyid = sanitize_int($surveyid);
-    $clang = new Limesurvey_lang($sLanguage);
 
     //checks to see if fieldmap has already been built for this page.
     if (isset(Yii::app()->session['fieldmap-' . $surveyid . $sLanguage]) && !$force_refresh && $questionid == false) {
         return Yii::app()->session['fieldmap-' . $surveyid . $sLanguage];
     }
 
+    $clang = new Limesurvey_lang($sLanguage);
     $fieldmap["id"]=array("fieldname"=>"id", 'sid'=>$surveyid, 'type'=>"id", "gid"=>"", "qid"=>"", "aid"=>"");
     if ($style == "full")
     {
@@ -2822,12 +2822,9 @@ function createFieldMap($surveyid, $style='short', $force_refresh=false, $questi
 * @param $surveyid The survey ID
 * @return bool
 */
-function hasFileUploadQuestion($surveyid) {
-    $fieldmap = createFieldMap($surveyid,'short',false,false,getBaseLanguageFromSurveyID($surveyid));
-
-    foreach ($fieldmap as $field) {
-        if (isset($field['type']) &&  $field['type'] === '|') return true;
-    }
+function hasFileUploadQuestion($iSurveyID) {
+    $iCount = Question::model()->count( "sid=:surveyid AND parent_qid=0 AND type='|'", array(':surveyid' => $iSurveyID));    
+    return $iCount>0 ;
 }
 
 /**

diff --git a/application/views/admin/responses/browseallheader_view.php b/application/views/admin/responses/browseallheader_view.php
@@ -105,7 +105,7 @@
 <?php if (Permission::model()->hasSurveyPermission($iSurveyId, 'responses', 'delete')) { ?>
 <img id='imgDeleteMarkedResponses' src='<?php echo $sImageURL; ?>token_delete.png' alt='<?php $clang->eT('Delete marked responses'); ?>' />
 <?php } ?>
-<?php if (hasFileUploadQuestion($iSurveyId)) { ?>
+<?php if ($bHasFileUploadQuestion) { ?>
 <img id='imgDownloadMarkedFiles' src='<?php echo $sImageURL; ?>down_all.png' alt='<?php $clang->eT('Download marked files'); ?>' />
 <?php } ?>
 </td>