Merge branch 'master' into develop

LimeSurvey · Apr 21, 2020 · 92bfd51 · 92bfd51
2 parents b9cd075 + b3248c7
commit 92bfd51
Show file tree

Hide file tree

Showing 8 changed files with 1,526 additions and 1,269 deletions.
diff --git a/application/models/Response.php b/application/models/Response.php
@@ -85,11 +85,13 @@ public function getFiles($qid = null)
          */
         public function getFilesAndSqga($sQID = 0)
         {
-            $aConditions = array('sid' => $this->dynamicId, 'type' => '|', 'language'=>$this->survey->language);
+            $aConditions = array('sid' => $this->dynamicId, 'type' => '|');
             if ($sQID > 0) {
                 $aConditions['qid'] = $sQID;
             }
-            $aQuestions = Question::model()->findAllByAttributes($aConditions);
+            $aQuestions = Question::model()
+                ->with(['questionl10ns' => ['language' => $this->survey->language]])
+                ->findAllByAttributes($aConditions);
             $files = array();
             foreach ($aQuestions as $question) {
                 $field = $question->sid.'X'.$question->gid.'X'.$question->qid;

diff --git a/assets/packages/questions/upload/build/uploadquestion.js b/assets/packages/questions/upload/build/uploadquestion.js
@@ -1,7 +1,7 @@
 (function (factory) {
     typeof define === 'function' && define.amd ? define(factory) :
     factory();
-}(function () { 'use strict';
+}((function () { 'use strict';
 
     /**
      * AJAX Upload ( http://valums.com/ajax-upload/ )
@@ -672,7 +672,7 @@
           this.$el.dialog("close");
         };
 
-        $(document).off('shown.bs.modal.lsuploadquestion');
+        $(document).off('shown.bs.modal.lsuploadquestion', '#file-upload-modal-' + this.fieldname);
         $(document).on('shown.bs.modal.lsuploadquestion', '#file-upload-modal-' + this.fieldname, () => {
           const uploadFrame = $('#uploader' + this.fieldname);
           uploadFrame.load(uploadFrame.data('src'));
@@ -1137,4 +1137,4 @@
       return window.currentUploadHandler;
     };
 
-}));
+})));
diff --git a/assets/packages/questions/upload/build/uploadquestion.min.js b/assets/packages/questions/upload/build/uploadquestion.min.js
diff --git a/assets/packages/questions/upload/build/uploadquestion.min.js.map b/assets/packages/questions/upload/build/uploadquestion.min.js.map
diff --git a/assets/packages/questions/upload/package.json b/assets/packages/questions/upload/package.json
@@ -31,6 +31,7 @@
         "terser": "^4.3.4"
     },
     "dependencies": {
-        "lodash": "^4.17.4"
+        "lodash": "^4.17.4",
+        "rollup": "^2.6.1"
     }
 }
diff --git a/assets/packages/questions/upload/src/modaldialog.js b/assets/packages/questions/upload/src/modaldialog.js
@@ -15,7 +15,7 @@ class UploadQuestionController {
             this.$el.dialog("close");
         };
 
-        $(document).off('shown.bs.modal.lsuploadquestion');
+        $(document).off('shown.bs.modal.lsuploadquestion', '#file-upload-modal-' + this.fieldname);
         $(document).on('shown.bs.modal.lsuploadquestion', '#file-upload-modal-' + this.fieldname, () => {
             const uploadFrame = $('#uploader' + this.fieldname);
             uploadFrame.load(uploadFrame.data('src'));

diff --git a/assets/packages/questions/upload/yarn.lock b/assets/packages/questions/upload/yarn.lock