diff --git a/local/qedatabase/db/upgrade.php b/local/qedatabase/db/upgrade.php index 8fb8eba9d15..2115c93e24f 100755 --- a/local/qedatabase/db/upgrade.php +++ b/local/qedatabase/db/upgrade.php @@ -44,4 +44,13 @@ function xmldb_local_qedatabase_upgrade($oldversion) { upgrade_plugin_savepoint(true, 2008000702, 'local', 'qedatabase'); } + if ($oldversion < 2008000703) { + // Rename the quiz_report table to quiz_reports. + $table = new xmldb_table('quiz_report'); + if ($dbman->table_exists($table)) { + $dbman->rename_table($table, 'quiz_reports'); + } + + upgrade_plugin_savepoint(true, 2008000703, 'local', 'qedatabase'); + } } diff --git a/local/qedatabase/version.php b/local/qedatabase/version.php index c0710ee2ad7..d9bc327a3d6 100755 --- a/local/qedatabase/version.php +++ b/local/qedatabase/version.php @@ -26,5 +26,5 @@ defined('MOODLE_INTERNAL') || die; -$plugin->version = 2008000702; +$plugin->version = 2008000703; $plugin->requires = 2010080300; diff --git a/mod/quiz/db/install.php b/mod/quiz/db/install.php index 686ba9e6c2f..cb9036e8396 100644 --- a/mod/quiz/db/install.php +++ b/mod/quiz/db/install.php @@ -11,16 +11,16 @@ function xmldb_quiz_install() { $record = new stdClass(); $record->name = 'overview'; $record->displayorder = '10000'; - $DB->insert_record('quiz_reports', $record); + $DB->insert_record('quiz_report', $record); $record = new stdClass(); $record->name = 'responses'; $record->displayorder = '9000'; - $DB->insert_record('quiz_reports', $record); + $DB->insert_record('quiz_report', $record); $record = new stdClass(); $record->name = 'grading'; $record->displayorder = '6000'; - $DB->insert_record('quiz_reports', $record); + $DB->insert_record('quiz_report', $record); } diff --git a/mod/quiz/db/install.xml b/mod/quiz/db/install.xml index 6da1a3affae..a8b41442595 100644 --- a/mod/quiz/db/install.xml +++ b/mod/quiz/db/install.xml @@ -12,21 +12,16 @@ - - - - - - - - - - - - - - - + + + + + + + + + + @@ -66,7 +61,7 @@ - + @@ -102,7 +97,7 @@ - +
@@ -116,7 +111,7 @@
- +
@@ -128,11 +123,8 @@ - - -
- +
diff --git a/mod/quiz/report/statistics/db/install.php b/mod/quiz/report/statistics/db/install.php index 8b19c5cbc66..24ddba85d3c 100644 --- a/mod/quiz/report/statistics/db/install.php +++ b/mod/quiz/report/statistics/db/install.php @@ -11,6 +11,6 @@ function xmldb_quiz_statistics_install() { $record->displayorder = 8000; $record->cron = 18000; $record->capability = 'quizreport/statistics:view'; - $DB->insert_record('quiz_reports', $record); + $DB->insert_record('quiz_report', $record); } \ No newline at end of file diff --git a/question/todo/quizinstall.diff.txt b/question/todo/quizinstall.diff.txt new file mode 100644 index 00000000000..34f2cdf1ab3 --- /dev/null +++ b/question/todo/quizinstall.diff.txt @@ -0,0 +1,100 @@ +diff --git a/mod/quiz/db/install.php b/mod/quiz/db/install.php +index cb9036e..686ba9e 100644 +--- a/mod/quiz/db/install.php ++++ b/mod/quiz/db/install.php +@@ -11,16 +11,16 @@ function xmldb_quiz_install() { + $record = new stdClass(); + $record->name = 'overview'; + $record->displayorder = '10000'; +- $DB->insert_record('quiz_report', $record); ++ $DB->insert_record('quiz_reports', $record); + + $record = new stdClass(); + $record->name = 'responses'; + $record->displayorder = '9000'; +- $DB->insert_record('quiz_report', $record); ++ $DB->insert_record('quiz_reports', $record); + + $record = new stdClass(); + $record->name = 'grading'; + $record->displayorder = '6000'; +- $DB->insert_record('quiz_report', $record); ++ $DB->insert_record('quiz_reports', $record); + + } +diff --git a/mod/quiz/db/install.xml b/mod/quiz/db/install.xml +index a8b4144..6da1a3a 100755 +--- a/mod/quiz/db/install.xml ++++ b/mod/quiz/db/install.xml +@@ -12,16 +12,21 @@ + + + +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -61,7 +66,7 @@ + + + +- ++ + + + +@@ -97,7 +102,7 @@ + + +
+- ++
+ + + +@@ -111,7 +116,7 @@ + + +
+- ++
+ + + +@@ -123,8 +128,11 @@ + + + ++ ++ ++ +
+- ++
+ + +