Fixed issue #9964: LS3 - .lss import error due to template formatting

LimeSurvey · Oct 22, 2015 · 7d1e68a · 7d1e68a
1 parent 90a3acd
commit 7d1e68a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/protected/controllers/tokens/Clear.php b/protected/controllers/tokens/Clear.php
@@ -24,7 +24,7 @@ public function run($surveyId)
         if (App()->request->getIsDeleteRequest()) {
             /** @todo Implement this. */
             if (Token::model($surveyId)->deleteAll()) {
-                App()->user->setFlash('info', gT("Deleting all tokens not yet implemented."));
+                App()->user->setFlash('success', gT("Tokens removed"));
                 $this->redirect(['tokens/index', 'surveyId' => $surveyId]);
             }
         } else {

diff --git a/protected/helpers/import/importers/Import178.php b/protected/helpers/import/importers/Import178.php
@@ -112,6 +112,10 @@ protected function importSurvey($data) {
         $oldKey = $survey->primaryKey;
         $survey->primaryKey = null;
         $questionMap = [];
+        // Workaround for unknown templates.
+        if (!$survey->validate(['template'])) {
+            $survey->template = null;
+        }
         if (!$survey->save()) {
             throw new \Exception("Could not save survey." . print_r($survey->errors, true));
         }

diff --git a/protected/models/Survey.php b/protected/models/Survey.php
@@ -245,6 +245,7 @@ public function rules()
             ['format', \CDefaultValueValidator::class, 'value' => self::FORMAT_ALL_IN_ONE],
             ['admin', \CDefaultValueValidator::class, 'value' => App()->user->getName()],
             ['template', \CDefaultValueValidator::class, 'value' => 'default'],
+
             ['datecreated', 'default', 'value' => date("Y-m-d")],
             ['startdate', 'default', 'value' => null],
             ['expires', 'default', 'value' => null],

diff --git a/protected/views/tokens/export.php b/protected/views/tokens/export.php
@@ -0,0 +1,2 @@
+<?php
+echo "@todo";