From c5a472884f4cdadf50f957ed710de1dd537543f6 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 10 Jul 2015 12:27:24 +0300 Subject: [PATCH] Fixes lp:1472581 add SGQ code to questions selector Somehow changes to quota.php in rev.512 didn't save. Added SGQ code to selector in questionnaireprefill.php too --- admin/questionnaireprefill.php | 2 +- admin/quota.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/questionnaireprefill.php b/admin/questionnaireprefill.php index a5562098..94dbff31 100644 --- a/admin/questionnaireprefill.php +++ b/admin/questionnaireprefill.php @@ -143,7 +143,7 @@ if ($questionnaire_id != false) if (isset($_GET['sgqa'])) $sgqa = $_GET['sgqa']; $sql = "SELECT CONCAT( q.sid, 'X', q.gid, 'X', q.qid) AS value, - CASE WHEN qo.question IS NULL THEN q.question ELSE CONCAT(qo.question,' : ',q.question) END as description, + CONCAT( q.sid, 'X', q.gid, 'X', q.qid, ' -> ' , CASE WHEN qo.question IS NULL THEN q.question ELSE CONCAT(qo.question,' : ',q.question) END) as description, CASE WHEN CONCAT(q.sid, 'X', q.gid, 'X', q.qid) = '$sgqa' THEN 'selected=\'selected\'' ELSE '' END AS selected FROM `" . LIME_PREFIX . "questions` AS q LEFT JOIN `" . LIME_PREFIX . "questions` as qo ON (qo.qid = q.parent_qid) diff --git a/admin/quota.php b/admin/quota.php index e3ea4bde..fce93b21 100755 --- a/admin/quota.php +++ b/admin/quota.php @@ -187,7 +187,7 @@ if ($questionnaire_id != false) if (isset($_GET['sgqa'])) $sgqa = $_GET['sgqa']; $sql = "SELECT CONCAT( lq.sid, 'X', lq.gid, 'X', CASE WHEN lq.parent_qid = 0 THEN lq.qid ELSE CONCAT(lq.parent_qid, lq.title) END) as value, - CASE WHEN lq.parent_qid = 0 THEN lq.question ELSE CONCAT(lq2.question, ': ', lq.question) END as description, + CONCAT( lq.sid, 'X', lq.gid, 'X', CASE WHEN lq.parent_qid = 0 THEN lq.qid ELSE CONCAT(lq.parent_qid, lq.title) END, ' -> ' , CASE WHEN lq.parent_qid = 0 THEN lq.question ELSE CONCAT(lq2.question, ' : ', lq.question) END) as description, CASE WHEN CONCAT( lq.sid, 'X', lq.gid, 'X', CASE WHEN lq.parent_qid = 0 THEN lq.qid ELSE CONCAT(lq.parent_qid, lq.title) END) = '$sgqa' THEN 'selected=\'selected\'' ELSE '' END AS selected FROM `" . LIME_PREFIX . "questions` AS lq LEFT JOIN `" . LIME_PREFIX . "questions` AS lq2 ON ( lq2.qid = lq.parent_qid )