L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-20636 fix URL handling for previews to always use Moodle URL.

Browse Source 
Also, make the preview window big enough. #367
This commit is contained in:
Tim Hunt
2011-05-27 11:49:23 +01:00
parent dc0373c852
commit 612106b3a4
7 changed files with 105 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/questionlib.php
+34 -19
View File
@@ -77,11 +77,6 @@ define("QUESTION_NUMANS_START", 3);
*/
define("QUESTION_NUMANS_ADD", 3);
/**
* The options used when popping up a question preview window in Javascript.
*/
define('QUESTION_PREVIEW_POPUP_OPTIONS', 'scrollbars=yes,resizable=yes,width=800,height=600');
/**
* Move one question type in a list of question types. If you try to move one element
* off of the end, nothing will change.
@@ -703,26 +698,46 @@ function question_move_category_to_context($categoryid, $oldcontextid, $newconte
* be picked randomly.
* @return string the URL.
*/
function question_preview_url($questionid, $preferredbehaviour, $maxmark, $displayoptions,
$variant = null) {
$params = array(
'id' => $questionid,
'behaviour' => $preferredbehaviour,
'maxmark' => $maxmark,
'correctness' => $displayoptions->correctness,
'marks' => $displayoptions->marks,
'markdp' => $displayoptions->markdp,
'feedback' => (bool) $displayoptions->feedback,
'generalfeedback' => (bool) $displayoptions->generalfeedback,
'rightanswer' => (bool) $displayoptions->rightanswer,
'history' => (bool) $displayoptions->history
);
function question_preview_url($questionid, $preferredbehaviour = null,
$maxmark = null, $displayoptions = null, $variant = null) {
$params = array('id' => $questionid);
if (!is_null($preferredbehaviour)) {
$params['behaviour'] = $preferredbehaviour;
}
if (!is_null($maxmark)) {
$params['maxmark'] = $maxmark;
}
if (!is_null($displayoptions)) {
$params['correctness'] = $displayoptions->correctness;
$params['marks'] = $displayoptions->marks;
$params['markdp'] = $displayoptions->markdp;
$params['feedback'] = (bool) $displayoptions->feedback;
$params['generalfeedback'] = (bool) $displayoptions->generalfeedback;
$params['rightanswer'] = (bool) $displayoptions->rightanswer;
$params['history'] = (bool) $displayoptions->history;
}
if ($variant) {
$params['variant'] = $variant;
}
return new moodle_url('/question/preview.php', $params);
}
/**
* @return array that can be passed as $params to the {@link popup_action} constructor.
*/
function question_preview_popup_params() {
return array(
'height' => 600,
'width' => 800,
);
}
/**
* Given a list of ids, load the basic information about a set of questions from
* the questions table. The $join and $extrafields arguments can be used together