Update survey.js and set description correctly
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
This commit is contained in:
parent
bbf8f76fc6
commit
dfa192ab41
11
js/survey.jquery.min.js
vendored
11
js/survey.jquery.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -39,7 +39,8 @@ $(document).ready(function () {
|
|||
questions = JSON.parse(questionJSON)
|
||||
|
||||
var surveyJSON = {
|
||||
title: form.title + ': ' + form.description,
|
||||
title: form.title,
|
||||
description: form.description,
|
||||
questions: []
|
||||
};
|
||||
|
||||
|
@ -56,4 +57,4 @@ $(document).ready(function () {
|
|||
onUpdateQuestionCssClasses: cssUpdate,
|
||||
onComplete: sendDataToServer,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
@ -285,17 +285,21 @@ class PageController extends Controller {
|
|||
|
||||
if ($this->hasUserAccess($form)) {
|
||||
$renderAs = $this->userId !== null ? 'user' : 'public';
|
||||
return new TemplateResponse('forms', 'vote.tmpl', [
|
||||
'form' => $form,
|
||||
'questions' => $this->getQuestions($form->getId()),
|
||||
'votes' => $votes,
|
||||
'participant' => $participants,
|
||||
'notification' => $notification,
|
||||
'userId' => $this->userId,
|
||||
'userMgr' => $this->userMgr,
|
||||
'urlGenerator' => $this->urlGenerator,
|
||||
'avatarManager' => $this->avatarManager
|
||||
$res = new TemplateResponse('forms', 'vote.tmpl', [
|
||||
'form' => $form,
|
||||
'questions' => $this->getQuestions($form->getId()),
|
||||
'votes' => $votes,
|
||||
'participant' => $participants,
|
||||
'notification' => $notification,
|
||||
'userId' => $this->userId,
|
||||
'userMgr' => $this->userMgr,
|
||||
'urlGenerator' => $this->urlGenerator,
|
||||
'avatarManager' => $this->avatarManager
|
||||
], $renderAs);
|
||||
$csp = new ContentSecurityPolicy();
|
||||
$csp->allowEvalScript(true);
|
||||
$res->setContentSecurityPolicy($csp);
|
||||
return $res;
|
||||
} else {
|
||||
User::checkLoggedIn();
|
||||
return new TemplateResponse('forms', 'no.acc.tmpl', []);
|
||||
|
|
Loading…
Reference in a new issue