mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 20:42:22 +02:00
Code Issues Projects Releases Wiki Activity

MDL-68252 question tags: fix tag editing for missingtype questions

Browse Source
This commit is contained in:
Tim Hunt 2020-03-25 17:16:44 +00:00
parent 89692520e8
commit fa7431ce50
6 changed files with 106 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/behat/classes/behat_core_generator.php
View File

@ -634,9 +634,18 @@ class behat_core_generator extends behat_generator_base {
* We start with test_question_maker::get_question_form_data($data['qtype'], $data['template'])
* and then overlay the values from any other fields of $data that are set.
*
* There is a special case that allows you to set qtype to 'missingtype'.
* This creates an example of broken question, such as you might get if you
* install a question type, create some questions of that type, and then
* uninstall the question type (which is prevented through the UI but can
* still happen). This special lets tests verify that these questions are
* handled OK.
*
* @param array $data the row of data from the behat script.
*/
protected function process_question($data) {
global $DB;
if (array_key_exists('questiontext', $data)) {
$data['questiontext'] = array(
'text' => $data['questiontext'],
@ -656,7 +665,18 @@ class behat_core_generator extends behat_generator_base {
$which = $data['template'];
}
$this->datagenerator->get_plugin_generator('core_question')->create_question($data['qtype'], $which, $data);
$missingtypespecialcase = false;
if ($data['qtype'] === 'missingtype') {
$data['qtype'] = 'essay'; // Actual type uses here does not matter. We just need any question.
$missingtypespecialcase = true;
}
$questiondata = $this->datagenerator->get_plugin_generator('core_question')
->create_question($data['qtype'], $which, $data);
if ($missingtypespecialcase) {
$DB->set_field('question', 'qtype', 'unknownqtype', ['id' => $questiondata->id]);
}
}
/**

7
lib/questionlib.php
View File

@ -1721,8 +1721,11 @@ function question_has_capability_on($questionorid, $cap, $notused = -1) {
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());
// Let's log the exception for future debugging,
// but not during Behat, or we can't test these cases.
if (!defined('BEHAT_SITE_RUNNING')) {
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

20
question/lib.php
View File

@ -43,6 +43,7 @@ function core_question_output_fragment_tags_form($args) {
$id = clean_param($args['id'], PARAM_INT);
$editingcontext = $args['context'];
// Load the question and some related information.
$question = $DB->get_record('question', ['id' => $id]);
if ($coursecontext = $editingcontext->get_course_context(false)) {
@ -52,14 +53,19 @@ function core_question_output_fragment_tags_form($args) {
$filtercourses = null;
}
// Load the question tags and filter the course tags by the current
// course.
get_question_options($question, true, $filtercourses);
$category = $question->categoryobject;
$category = $DB->get_record('question_categories', ['id' => $question->category]);
$questioncontext = \context::instance_by_id($category->contextid);
$contexts = new \question_edit_contexts($editingcontext);
// Load the question tags and filter the course tags by the current course.
if (core_tag_tag::is_enabled('core_question', 'question')) {
$tagobjectsbyquestion = core_tag_tag::get_items_tags('core_question', 'question', [$question->id]);
if (!empty($tagobjectsbyquestion[$question->id])) {
$tagobjects = $tagobjectsbyquestion[$question->id];
$sortedtagobjects = question_sort_tags($tagobjects,
context::instance_by_id($category->contextid), $filtercourses);
}
}
$formoptions = [
'editingcontext' => $editingcontext,
'questioncontext' => $questioncontext,
@ -72,8 +78,8 @@ function core_question_output_fragment_tags_form($args) {
'categoryid' => $category->id,
'contextid' => $category->contextid,
'context' => $questioncontext->get_context_name(),
'tags' => isset($question->tags) ? $question->tags : [],
'coursetags' => isset($question->coursetags) ? $question->coursetags : [],
'tags' => $sortedtagobjects->tags ?? [],
'coursetags' => $sortedtagobjects->coursetags ?? [],
];
$cantag = question_has_capability_on($question, 'tag');

11
question/tests/behat/delete_questions.feature
View File

@ -56,3 +56,14 @@ Feature: A teacher can delete questions in the question bank
And I follow "Test quiz"
And I click on "Preview quiz now" "button"
And I should see "Write about whatever you want"
@javascript
Scenario: A question can be deleted even if that question type is no longer installed
Given the following "questions" exist:
| questioncategory | qtype | name | questiontext |
| Test questions | missingtype | Broken question | Write something |
And I reload the page
When I choose "Delete" action for "Broken question" in the question bank
And I press "Delete"
And I click on "Also show old questions" "checkbox"
Then I should not see "Broken question"

44
question/tests/behat/edit_question_tags.feature Normal file
View File

@ -0,0 +1,44 @@
@core @core_question
Feature: A teacher can manage tags on questions in the question bank
In order to organise my questions
As a teacher
I need to be able to tag them
Background:
Given the following "users" exist:
| username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@example.com |
And the following "courses" exist:
| fullname | shortname | format |
| Course 1 | C1 | weeks |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
And the following "question categories" exist:
| contextlevel | reference | name |
| Course | C1 | Test questions |
And the following "questions" exist:
| questioncategory | qtype | name | questiontext |
| Test questions | essay | Test question to be tagged | Write about whatever you want |
And I log in as "teacher1"
And I am on "Course 1" course homepage
And I navigate to "Question bank > Questions" in current page administration
@javascript
Scenario: Manage tags on a question
When I choose "Manage tags" action for "Test question to be tagged" in the question bank
And I should see "Test question to be tagged" in the "Question tags" "dialogue"
And I set the field "Tags" to "my-tag"
And I click on "Save changes" "button" in the "Question tags" "dialogue"
Then I should see "my-tag" in the "Test question to be tagged" "table_row"
@javascript
Scenario: Manage tags works even on questions of a type is no longer installed
Given the following "questions" exist:
| questioncategory | qtype | name | questiontext |
| Test questions | missingtype | Broken question | Write something |
And I reload the page
When I choose "Manage tags" action for "Broken question" in the question bank
And I set the field "Tags" to "my-tag"
And I click on "Save changes" "button" in the "Question tags" "dialogue"
Then I should see "my-tag" in the "Broken question" "table_row"

12
question/tests/behat/edit_questions.feature
View File

@ -53,3 +53,15 @@ Feature: A teacher can edit questions in the question bank
And I set the field "ID number" to ""
And I press "id_submitbutton"
Then I should not see "frog" in the "Question with idnumber" "table_row"
Scenario: If the question type is no longer installed, then most edit actions are not present
Given the following "questions" exist:
| questioncategory | qtype | name | questiontext |
| Test questions | missingtype | Broken question | Write something |
When I reload the page
Then "Edit question" "link" should not exist in the "Broken question" "table_row"
And "Duplicate" "link" should not exist in the "Broken question" "table_row"
And "Manage tags" "link" should exist in the "Broken question" "table_row"
And "Preview" "link" should not exist in the "Broken question" "table_row"
And "Delete" "link" should exist in the "Broken question" "table_row"
And "Export as Moodle XML" "link" should not exist in the "Broken question" "table_row"