From 3e114eddba2d2233800f5486551b300e47c807f0 Mon Sep 17 00:00:00 2001 From: louis Date: Mon, 5 Oct 2015 12:18:30 +0200 Subject: [PATCH] Dev: removing question text from last visited id question has no text --- application/controllers/admin/index.php | 5 ++++- application/controllers/admin/surveyadmin.php | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/application/controllers/admin/index.php b/application/controllers/admin/index.php index 05c4960c35c..4d302de5e91 100644 --- a/application/controllers/admin/index.php +++ b/application/controllers/admin/index.php @@ -62,7 +62,10 @@ public function run() $sid = $lastquestionsid; $qrrow = Question::model()->findByAttributes(array('qid' => $qid, 'gid' => $gid, 'sid' => $sid, 'language' => $baselang)); - $aData['last_question_name'] = $qrrow['title'].' : '.$qrrow['question']; + $aData['last_question_name'] = $qrrow['title']; + if($qrrow['question']) + $aData['last_question_name'] .= ' : '.$qrrow['question']; + $aData['last_question_link'] = $this->getController()->createUrl("admin/questions/sa/view/surveyid/$iSurveyID/gid/$gid/qid/$qid"); } else diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php index 799ddfe6198..0419ccbd9eb 100644 --- a/application/controllers/admin/surveyadmin.php +++ b/application/controllers/admin/surveyadmin.php @@ -356,7 +356,11 @@ public function view($iSurveyID, $gid = null, $qid = null) $gid = $lastquestiongroup; $qrrow = Question::model()->findByAttributes(array('qid' => $qid, 'gid' => $gid, 'sid' => $iSurveyID, 'language' => $baselang)); - $aData['last_question_name'] = $qrrow['title'].' : '.$qrrow['question']; + $aData['last_question_name'] = $qrrow['title']; + if($qrrow['question']) + $aData['last_question_name'] .= ' : '.$qrrow['question']; + + $aData['last_question_link'] = $this->getController()->createUrl("admin/questions/sa/view/surveyid/$iSurveyID/gid/$gid/qid/$qid"); } else