moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-61045' of git://github.com/timhunt/moodle

Browse source
This commit is contained in:
David Monllao 2017-12-19 06:43:17 +01:00
commit d41203c55f
2 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mod/quiz/mod_form.php
View file

@ -242,6 +242,9 @@ class mod_quiz_mod_form extends moodleform_mod {
'neq', 'wontmatch'); 'neq', 'wontmatch');
$mform->disabledIf('overallfeedbackduring', 'preferredbehaviour', $mform->disabledIf('overallfeedbackduring', 'preferredbehaviour',
'neq', 'wontmatch'); 'neq', 'wontmatch');
foreach (self::$reviewfields as $field => $notused) {
$mform->disabledIf($field . 'closed', 'timeclose[enabled]');
}
// ------------------------------------------------------------------------------- // -------------------------------------------------------------------------------
$mform->addElement('header', 'display', get_string('appearance')); $mform->addElement('header', 'display', get_string('appearance'));

21
mod/quiz/tests/behat/settings_form_fields_disableif.feature
View file

@ -95,3 +95,24 @@ Feature: Settings form fields disabled if not required
And the "Each attempt builds on the last" "field" should be enabled And the "Each attempt builds on the last" "field" should be enabled
And the "id_delay1_enabled" "field" should be enabled And the "id_delay1_enabled" "field" should be enabled
And the "id_delay2_enabled" "field" should be enabled And the "id_delay2_enabled" "field" should be enabled
@javascript
Scenario: Depending on whether there is a close date, some review options are disabled.
When I add a "Quiz" to section "1"
And I expand all fieldsets
And I set the field "Name" to "Test quiz"
Then the "id_attemptclosed" "checkbox" should be disabled
Then the "id_correctnessclosed" "checkbox" should be disabled
Then the "id_marksclosed" "checkbox" should be disabled
Then the "id_specificfeedbackclosed" "checkbox" should be disabled
Then the "id_generalfeedbackclosed" "checkbox" should be disabled
Then the "id_rightanswerclosed" "checkbox" should be disabled
Then the "id_overallfeedbackclosed" "checkbox" should be disabled
And I set the field "id_timeclose_enabled" to "1"
Then the "id_attemptclosed" "checkbox" should be enabled
Then the "id_correctnessclosed" "checkbox" should be enabled
Then the "id_marksclosed" "checkbox" should be enabled
Then the "id_specificfeedbackclosed" "checkbox" should be enabled
Then the "id_generalfeedbackclosed" "checkbox" should be enabled
Then the "id_rightanswerclosed" "checkbox" should be enabled
Then the "id_overallfeedbackclosed" "checkbox" should be enabled