diff options
| author | Jean-Michel Vedrine <vedrine@vedrine.org> | 2019-04-28 09:37:43 +0200 |
|---|---|---|
| committer | Jean-Michel Vedrine <vedrine@vedrine.org> | 2019-04-28 09:37:43 +0200 |
| commit | e0dda838a0cffd6b1f4fd3706e75537c1906b5ec (patch) | |
| tree | 9d45fa7413700acef68896983e702b7a0ec85ca3 | |
| parent | f2352f6e189fc1a40836957e39f5243b9d826521 (diff) | |
Fix errors returned from travis job
| -rw-r--r-- | combinable/combinable.php | 4 | ||||
| -rw-r--r-- | db/upgrade.php | 2 | ||||
| -rw-r--r-- | tests/behat/backup_and_restore.feature | 1 | ||||
| -rw-r--r-- | tests/behat/export.feature | 2 |
4 files changed, 2 insertions, 7 deletions
diff --git a/combinable/combinable.php b/combinable/combinable.php index e956073..ad4bfaf 100644 --- a/combinable/combinable.php +++ b/combinable/combinable.php @@ -129,12 +129,9 @@ class qtype_combined_combinable_algebra extends qtype_combined_combinable_text_e $variables['varmax'][] = $variable->max; } $data = parent::data_to_form($context, $fileoptions) + $answers + $variables; - - return $data; } - public function validate() { $errors = array(); // Regular expression string to match a number. @@ -258,7 +255,6 @@ class qtype_combined_combinable_algebra extends qtype_combined_combinable_text_e $errors[$this->form_field_name('tolerance')] = get_string('toleranceltzero', 'qtype_algebra'); } - return $errors; } diff --git a/db/upgrade.php b/db/upgrade.php index f1db600..e3fc7df 100644 --- a/db/upgrade.php +++ b/db/upgrade.php @@ -80,7 +80,7 @@ function xmldb_qtype_algebra_upgrade($oldversion=0) { } upgrade_plugin_savepoint(true, 2012061702, 'qtype', 'algebra'); } - + if ($oldversion < 2019042705) { // Define key question (foreign) to be dropped form qtype_algebra_variables. diff --git a/tests/behat/backup_and_restore.feature b/tests/behat/backup_and_restore.feature index 57c2423..5512934 100644 --- a/tests/behat/backup_and_restore.feature +++ b/tests/behat/backup_and_restore.feature @@ -41,4 +41,3 @@ Feature: Test duplicating a quiz containing an Algebra question | id_answer_0 | 7*x | | id_fraction_0 | 100% | | id_feedback_0 | This is a very good answer. | - diff --git a/tests/behat/export.feature b/tests/behat/export.feature index 1c7435b..10057ff 100644 --- a/tests/behat/export.feature +++ b/tests/behat/export.feature @@ -1,5 +1,5 @@ @qtype @qtype_algebra -Feature: Test exporting Short answer questions +Feature: Test exporting Algebra questions As a teacher In order to be able to reuse my Algebra questions I need to export them |