From 2bc5429232ff8078ab64582835daad4cccf2f592 Mon Sep 17 00:00:00 2001 From: Denis Chenu Date: Sat, 23 Jun 2012 12:57:32 +0200 Subject: [PATCH] Fixed issue #06261 : unable to preview non-active survey, group, or question Description Dev : put test in replacements, maybe best is to rework Survey_dynamic::model --- application/helpers/replacements_helper.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/application/helpers/replacements_helper.php b/application/helpers/replacements_helper.php index 81d5c45ec4b..ec41e9009e0 100644 --- a/application/helpers/replacements_helper.php +++ b/application/helpers/replacements_helper.php @@ -399,11 +399,15 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de $_linkreplace=''; } - if(isset($surveyid) && !isset($saved_id) && isset($_SESSION['survey_'.$surveyid]['srid'])) + if(isset($thissurvey['sid']) && isset($_SESSION['survey_'.$thissurvey['sid']]['srid']) && $thissurvey['active']=='Y') { - $saved_id=$_SESSION['survey_'.$surveyid]['srid']; + $iscompleted=Survey_dynamic::model($surveyid)->isCompleted($_SESSION['survey_'.$thissurvey['sid']]['srid']); } - if (isset($surveyid) && !Survey_dynamic::model($surveyid)->isCompleted(isset($saved_id) ? $saved_id : 0)) + else + { + $iscompleted=false; + } + if (isset($surveyid) && !$iscompleted) { $_clearall = "gT("Are you sure you want to clear all your responses?", 'js') . "')) {\nwindow.open('".Yii::app()->getController()->createUrl("survey/index/sid/$surveyid?move=clearall&lang=" . $s_lang);