Fixed issue #13638: Panel with user surveys doesn't load

LimeSurvey · Apr 27, 2018 · 1dde1f5 · 1dde1f5
1 parent a2fcabb
commit 1dde1f5
Show file tree

Hide file tree

Showing 7 changed files with 3,037 additions and 6 deletions.
diff --git a/application/models/Participant.php b/application/models/Participant.php
@@ -1690,7 +1690,7 @@ private function writeParticipantsToTokenTable(
                     'lastname' => $participant['lastname'],
                     'email' => $participant['email'],
                     'emailstatus' => 'OK',
-                    'language' => $participant['language']
+                    'language' => isset($participant['language']) ? $participant['language'] : App()->language
                 );
 
                 Yii::app()->db

diff --git a/application/models/SurveyLink.php b/application/models/SurveyLink.php
@@ -67,7 +67,7 @@ public function relations()
         // class name for the relations automatically generated below.
         return array(
             'participant' => array(self::HAS_ONE, 'Particiant', 'participant_id'),
-            'survey' => array(self::HAS_ONE, 'Survey', array('survey_id'=>'sid'))
+            'survey' => array(self::HAS_ONE, 'Survey', array('sid'=>'survey_id'))
         );
     }
 

diff --git a/assets/packages/lslog/build/lslog.min.js b/assets/packages/lslog/build/lslog.min.js
diff --git a/assets/packages/lslog/gulpfile.js b/assets/packages/lslog/gulpfile.js
@@ -44,7 +44,7 @@ gulp.task('babel', function (cb) {
         [
             gulp.src('src/lslog.js'),
             babel({
-                presets: ['es2015']
+                presets: [['env', {targets: {browsers: "last 2 versions"}}]]
             }),
             gulp.dest('build/')
         ],
@@ -59,7 +59,7 @@ gulp.task('babel:production', function (cb) {
             gulp.src('src/lslog.js'),
             sourcemaps.init(),
             babel({
-                presets: ['es2015']
+                presets: [['env', {targets: {browsers: "last 2 versions"}}]]
             }),
             uglify(),
             rename('lslog.min.js'),

diff --git a/assets/packages/lslog/package.json b/assets/packages/lslog/package.json
@@ -0,0 +1,16 @@
+{
+  "devDependencies": {
+    "babel-core": "^6.26.0",
+    "babel-preset-env": "^1.6.1",
+    "babel-preset-es2015": "^6.24.1",
+    "gulp": "^3.9.1",
+    "gulp-autoprefixer": "^5.0.0",
+    "gulp-babel": "^7.0.1",
+    "gulp-eslint": "^4.0.2",
+    "gulp-rename": "^1.2.2",
+    "gulp-sourcemaps": "^2.6.4",
+    "gulp-uglify": "^3.0.0",
+    "pump": "^3.0.0",
+    "run-sequence": "^2.2.1"
+  }
+}