Fixed issue #7006: Copying a survey and setting "reset conditions" do…

…esn't reset relevance equations
LimeSurvey · Dec 5, 2012 · 81e3560 · 81e3560
1 parent b833915
commit 81e3560
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -942,6 +942,11 @@ public function copy()
             elseif ($action == 'copysurvey' && (empty($importerror) || !$importerror))
             {
                 $aImportResults = XMLImportSurvey('', $copysurveydata, $sNewSurveyName);
+                if (isset($exclude['conditions']))
+                {
+                    Questions::model()->updateAll(array('relevance'=>'1'),'sid='.$aImportResults['newsid']);
+                    Groups::model()->updateAll(array('grelevance'=>'1'),'sid='.$aImportResults['newsid']);
+                }
                 if (!isset($exclude['permissions']))
                 {
                     Survey_permissions::model()->copySurveyPermissions($iSurveyID,$aImportResults['newsid']);

diff --git a/application/views/admin/survey/subview/tabCopy_view.php b/application/views/admin/survey/subview/tabCopy_view.php
@@ -15,7 +15,7 @@
                 <input id='copysurveyexcludepermissions' name="copysurveyexcludepermissions" type="checkbox"/></li>
             <li><label for='copysurveyexcludeanswers'><?php echo $clang->gT("Exclude answers?"); ?> </label>
                 <input id='copysurveyexcludeanswers' name="copysurveyexcludeanswers" type="checkbox" /></li>
-            <li><label for='copysurveyresetconditions'><?php echo $clang->gT("Reset conditions?"); ?></label>
+            <li><label for='copysurveyresetconditions'><?php echo $clang->gT("Reset conditions/relevance?"); ?></label>
                 <input id='copysurveyresetconditions' name="copysurveyresetconditions" type="checkbox" /></li>
         </ul>
         <p><input type='submit' value='<?php $clang->eT("Copy survey"); ?>' />