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

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

Browse Source 
Conflicts:
	lib/db/upgrade.php
	version.php
This commit is contained in:
Eloy Lafuente (stronk7)
2013-03-26 23:38:07 +01:00
parent b741fac308 7dbde4ed3b
commit cf140de945
7 changed files with 103 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/db/upgrade.php
+7
View File
@@ -1779,5 +1779,12 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2013032600.03);
}
if ($oldversion < 2013032600.04) {
// MDL-31983 broke the quiz version number. Fix it.
$DB->set_field('modules', 'version', '2013021500',
array('name' => 'quiz', 'version' => '2013310100'));
upgrade_main_savepoint(true, 2013032600.04);
}
return true;
}
mod/quiz/db/upgrade.php
+7
View File
@@ -395,6 +395,13 @@ function xmldb_quiz_upgrade($oldversion) {
// Moodle v2.4.0 release upgrade line
// Put any upgrade step following this
if ($oldversion < 2013031900) {
// Quiz manual grading UI should be controlled by mod/quiz:grade, not :viewreports.
$DB->set_field('quiz_reports', 'capability', 'mod/quiz:grade', array('name' => 'grading'));
// Mod quiz savepoint reached.
upgrade_mod_savepoint(true, 2013031900, 'quiz');
}
return true;
}
mod/quiz/report/grading/db/install.php
+40
View File
@@ -0,0 +1,40 @@
<?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/>.
/**
* Post-install script for the quiz manual grading report.
* @package quiz_grading
* @copyright 2013 Tim Hunt
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
/**
* Post-install script
*/
function xmldb_quiz_grading_install() {
global $DB;
$record = new stdClass();
$record->name = 'grading';
$record->displayorder = '6000';
$record->capability = 'mod/quiz:grade';
$DB->insert_record('quiz_reports', $record);
}
mod/quiz/db/install.php → mod/quiz/report/overview/db/install.php
+6 -17
View File
@@ -15,12 +15,10 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Post-install code for the quiz module.
*
* @package mod
* @subpackage quiz
* @copyright 2009 Petr Skoda
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* Post-install script for the quiz grades report.
* @package quiz_overview
* @copyright 2013 Tim Hunt
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -28,23 +26,14 @@ defined('MOODLE_INTERNAL') || die();
/**
* Code run after the quiz module database tables have been created.
* Post-install script
*/
function xmldb_quiz_install() {
function xmldb_quiz_overview_install() {
global $DB;
$record = new stdClass();
$record->name = 'overview';
$record->displayorder = '10000';
$DB->insert_record('quiz_reports', $record);
$record = new stdClass();
$record->name = 'responses';
$record->displayorder = '9000';
$DB->insert_record('quiz_reports', $record);
$record = new stdClass();
$record->name = 'grading';
$record->displayorder = '6000';
$DB->insert_record('quiz_reports', $record);
}
mod/quiz/report/responses/db/install.php
+39
View File
@@ -0,0 +1,39 @@
<?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/>.
/**
* Post-install script for the quiz responses report.
* @package quiz_responses
* @copyright 2013 Tim Hunt
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
/**
* Post-install script
*/
function xmldb_quiz_responses_install() {
global $DB;
$record = new stdClass();
$record->name = 'responses';
$record->displayorder = '9000';
$DB->insert_record('quiz_reports', $record);
}
mod/quiz/version.php
+3 -3
View File
@@ -25,7 +25,7 @@
defined('MOODLE_INTERNAL') || die();
$module->version = 2013310100; // The current module version (Date: YYYYMMDDXX).
$module->requires = 2012112900; // Requires this Moodle version.
$module->component = 'mod_quiz'; // Full name of the plugin (used for diagnostics).
$module->version = 2013031900; // The current module version (Date: YYYYMMDDXX).
$module->requires = 2012112900; // Requires this Moodle version.
$module->component = 'mod_quiz'; // Full name of the plugin (used for diagnostics).
$module->cron = 60;
version.php
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2013032600.03; // YYYYMMDD = weekly release date of this DEV branch
$version = 2013032600.04; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes