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

Merge branch 'MDL-63809-36-5' of git://github.com/rezaies/moodle into MOODLE_36_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2019-01-07 22:13:00 +01:00
parent 8555878283 10c38b2e34
commit 90fc88b56d
8 changed files with 140 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/questionlib.php
+27 -10
View File
@@ -921,8 +921,6 @@ function question_load_questions($questionids, $extrafields = '', $join = '') {
* @param stdClass[]|null $filtercourses The courses to filter the course tags by.
*/
function _tidy_question($question, $category, array $tagobjects = null, array $filtercourses = null) {
global $CFG;
// Load question-type specific fields.
if (!question_bank::is_qtype_installed($question->qtype)) {
$question->questiontext = html_writer::tag('p', get_string('warningmissingtype',
@@ -1651,25 +1649,44 @@ class context_to_string_translator{
/**
* Check capability on category
*
* @param mixed $questionorid object or id. If an object is passed, it should include ->contextid and ->createdby.
* @param int|stdClass $questionorid object or id. If an object is passed, it should include ->contextid and ->createdby.
* @param string $cap 'add', 'edit', 'view', 'use', 'move' or 'tag'.
* @param integer $notused no longer used.
* @return boolean this user has the capability $cap for this question $question?
* @param int $notused no longer used.
* @return bool this user has the capability $cap for this question $question?
* @throws coding_exception
*/
function question_has_capability_on($questionorid, $cap, $notused = -1) {
global $USER;
global $USER, $DB;
if (is_numeric($questionorid)) {
$question = question_bank::load_question_data((int)$questionorid);
$questionid = (int)$questionorid;
} else if (is_object($questionorid)) {
// All we really need in this function is the contextid and author of the question.
// We won't bother fetching other details of the question if these 2 fields are provided.
if (isset($questionorid->contextid) && isset($questionorid->createdby)) {
$question = $questionorid;
} else if (!empty($questionorid->id)) {
$questionid = $questionorid->id;
}
}
if (!isset($question) && isset($questionorid->id) && $questionorid->id != 0) {
$question = question_bank::load_question_data($questionorid->id);
// At this point, either $question or $questionid is expected to be set.
if (isset($questionid)) {
try {
$question = question_bank::load_question_data($questionid);
} catch (Exception $e) {
// Let's log the exception for future debugging.
debugging($e->getMessage(), DEBUG_NORMAL, $e->getTrace());
// Well, at least we tried. Seems that we really have to read from DB.
$question = $DB->get_record_sql('SELECT q.id, q.createdby, qc.contextid
FROM {question} q
JOIN {question_categories} qc ON q.category = qc.id
WHERE q.id = :id', ['id' => $questionid]);
}
} else {
}
if (!isset($question)) {
throw new coding_exception('$questionorid parameter needs to be an integer or an object.');
}
lib/tests/questionlib_test.php
+31
View File
@@ -1643,6 +1643,37 @@ class core_questionlib_testcase extends advanced_testcase {
];
}
/**
* Tests that question_has_capability_on does not throw exception on broken questions.
*/
public function test_question_has_capability_on_broken_question() {
global $DB;
// Create the test data.
$generator = $this->getDataGenerator();
$questiongenerator = $generator->get_plugin_generator('core_question');
$category = $generator->create_category();
$context = context_coursecat::instance($category->id);
$questioncat = $questiongenerator->create_question_category([
'contextid' => $context->id,
]);
// Create a cloze question.
$question = $questiongenerator->create_question('multianswer', null, [
'category' => $questioncat->id,
]);
// Now, break the question.
$DB->delete_records('question_multianswer', ['question' => $question->id]);
$this->setAdminUser();
$result = question_has_capability_on($question->id, 'tag');
$this->assertTrue($result);
$this->assertDebuggingCalled();
}
/**
* Tests for the deprecated question_has_capability_on function when passing a stdClass as parameter.
*
mod/quiz/classes/question/bank/add_action_column.php
-4
View File
@@ -52,8 +52,4 @@ class add_action_column extends \core_question\bank\action_column_base {
}
$this->print_icon('t/add', $this->stradd, $this->qbank->add_to_quiz_url($question->id));
}
public function get_required_fields() {
return array('q.id');
}
}
mod/quiz/tests/quiz_question_bank_view_test.php
+75
View File
@@ -0,0 +1,75 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Unit tests for the quiz's own question bank view class.
*
* @package mod_quiz
* @category test
* @copyright 2018 the Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/question/editlib.php');
/**
* Unit tests for the quiz's own question bank view class.
*
* @copyright 2018 the Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class quiz_question_bank_view_testcase extends advanced_testcase {
public function test_viewing_question_bank_should_not_load_individual_questions() {
$this->resetAfterTest();
$this->setAdminUser();
$generator = $this->getDataGenerator();
/** @var core_question_generator $questiongenerator */
$questiongenerator = $generator->get_plugin_generator('core_question');
// Create a course and a quiz.
$course = $generator->create_course();
$quiz = $this->getDataGenerator()->create_module('quiz', array('course' => $course->id));
$context = context_module::instance($quiz->cmid);
$cm = get_coursemodule_from_instance('quiz', $quiz->id);
// Create a question in the default category.
$contexts = new question_edit_contexts($context);
$cat = question_make_default_categories($contexts->all());
$questiondata = $questiongenerator->create_question('numerical', null,
['name' => 'Example question', 'category' => $cat->id]);
// Ensure the question is not in the cache.
$cache = cache::make('core', 'questiondata');
$cache->delete($questiondata->id);
// Generate the view.
$view = new mod_quiz\question\bank\custom_view($contexts, new moodle_url('/'), $course, $cm, $quiz);
ob_start();
$view->display('editq', 0, 20, $cat->id . ',' . $cat->contextid, false, false, false);
$html = ob_get_clean();
// Verify the output includes the expected question.
$this->assertContains('Example question', $html);
// Verify the question has not been loaded into the cache.
$this->assertFalse($cache->has($questiondata->id));
}
}
question/classes/bank/delete_action_column.php
+3 -1
View File
@@ -51,6 +51,8 @@ class delete_action_column extends action_column_base {
}
public function get_required_fields() {
return array('q.id', 'q.hidden');
$required = parent::get_required_fields();
$required[] = 'q.hidden';
return $required;
}
}
question/classes/bank/preview_action_column.php
-4
View File
@@ -34,8 +34,4 @@ class preview_action_column extends action_column_base {
$question->id, $this->qbank->get_most_specific_context(), false);
}
}
public function get_required_fields() {
return array('q.id');
}
}
question/engine/bank.php
+1 -1
View File
@@ -267,7 +267,7 @@ abstract class question_bank {
global $DB;
if (self::$testmode) {
// Evil, test code in production, but now way round it.
// Evil, test code in production, but no way round it.
return self::return_test_question_data($questionid);
}
question/tests/bank_view_test.php
+3 -3
View File
@@ -44,7 +44,7 @@ class core_question_bank_view_testcase extends advanced_testcase {
/** @var core_question_generator $questiongenerator */
$questiongenerator = $generator->get_plugin_generator('core_question');
// Cerate a course.
// Create a course.
$course = $generator->create_course();
$context = context_course::instance($course->id);
@@ -54,7 +54,7 @@ class core_question_bank_view_testcase extends advanced_testcase {
$questiondata = $questiongenerator->create_question('numerical', null,
['name' => 'Example question', 'category' => $cat->id]);
// Ensure the qusetion is not in the cache.
// Ensure the question is not in the cache.
$cache = cache::make('core', 'questiondata');
$cache->delete($questiondata->id);
@@ -67,7 +67,7 @@ class core_question_bank_view_testcase extends advanced_testcase {
// Verify the output includes the expected question.
$this->assertContains('Example question', $html);
// Verify the qusetion has not been loaded into the cache.
// Verify the question has not been loaded into the cache.
$this->assertFalse($cache->has($questiondata->id));
}
}