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

MDL-9367 restore: Roll only configuration dates

Browse source 
It was decided to roll only configuration dates and any date related to user content
such as 'timecreated' , 'timemodified' etc should not be rolled forward.
This commit is contained in:
Ankit Agarwal 2017-06-29 13:38:47 +05:30
parent d509f80c48
commit 0d14fcbc60
57 changed files with 1617 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

7
mod/assign/backup/moodle2/restore_assign_stepslib.php
View file

@ -87,7 +87,8 @@ class restore_assign_activity_structure_step extends restore_activity_structure_
$oldid = $data->id;
$data->course = $this->get_courseid();
$data->timemodified = $this->apply_date_offset($data->timemodified);
// Any changes to the list of dates that needs to be rolled should be same during course restore and course reset.
// See MDL-9367.
$data->allowsubmissionsfromdate = $this->apply_date_offset($data->allowsubmissionsfromdate);
$data->duedate = $this->apply_date_offset($data->duedate);
@ -159,8 +160,6 @@ class restore_assign_activity_structure_step extends restore_activity_structure_
$data->assignment = $this->get_new_parentid('assign');
$data->timemodified = $this->apply_date_offset($data->timemodified);
$data->timecreated = $this->apply_date_offset($data->timecreated);
if ($data->userid > 0) {
$data->userid = $this->get_mappingid('user', $data->userid);
}
@ -220,8 +219,6 @@ class restore_assign_activity_structure_step extends restore_activity_structure_
$data->assignment = $this->get_new_parentid('assign');
$data->timemodified = $this->apply_date_offset($data->timemodified);
$data->timecreated = $this->apply_date_offset($data->timecreated);
$data->userid = $this->get_mappingid('user', $data->userid);
$data->grader = $this->get_mappingid('user', $data->grader);

2
mod/assign/locallib.php
View file

@ -1035,6 +1035,8 @@ class assign {
WHERE assignid =? AND cutoffdate <> 0",
array($data->timeshift, $this->get_instance()->id));
// Any changes to the list of dates that needs to be rolled should be same during course restore and course reset.
// See MDL-9367.
shift_course_mod_dates('assign',
array('duedate', 'allowsubmissionsfromdate', 'cutoffdate'),
$data->timeshift,

92
mod/assign/tests/restore_date_test.php Normal file
View file

@ -0,0 +1,92 @@
<?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/>.
/**
* Restore date tests.
*
* @package mod_assign
* @copyright 2017 onwards Ankit Agarwal <ankit.agrr@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->libdir . "/phpunit/classes/restore_date_testcase.php");
require_once($CFG->dirroot . '/mod/assign/tests/base_test.php');
/**
* Restore date tests.
*
* @package mod_assign
* @copyright 2017 onwards Ankit Agarwal <ankit.agrr@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_assign_restore_date_testcase extends restore_date_testcase {
/**
* Test restore dates.
*/
public function test_restore_dates() {
global $DB, $USER;
$record = ['cutoffdate' => 100, 'allowsubmissionsfromdate' => 100, 'duedate' => 100, 'timemodified' => 100];
list($course, $assign) = $this->create_course_and_module('assign', $record);
$cm = $DB->get_record('course_modules', ['course' => $course->id, 'instance' => $assign->id]);
$assignobj = new testable_assign(context_module::instance($cm->id), $cm, $course);
$submission = $assignobj->get_user_submission($USER->id, true);
$grade = $assignobj->get_user_grade($USER->id, true);
// User override.
$override = (object)[
'assignid' => $assign->id,
'groupid' => 0,
'userid' => $USER->id,
'sortorder' => 1,
'allowsubmissionsfromdate' => 100,
'duedate' => 200,
'cutoffdate' => 300
];
$DB->insert_record('assign_overrides', $override);
// Do backup and restore.
$newcourseid = $this->backup_and_restore($course);
$newassign = $DB->get_record('assign', ['course' => $newcourseid]);
$this->assertFieldsNotRolledForward($assign, $newassign, ['timemodified']);
$props = ['allowsubmissionsfromdate', 'duedate', 'cutoffdate'];
$this->assertFieldsRolledForward($assign, $newassign, $props);
$newsubmission = $DB->get_record('assign_submission', ['assignment' => $newassign->id]);
$newoverride = $DB->get_record('assign_overrides', ['assignid' => $newassign->id]);
$newgrade = $DB->get_record('assign_grades', ['assignment' => $newassign->id]);
// Assign submission time checks.
$this->assertEquals($submission->timecreated, $newsubmission->timecreated);
$this->assertEquals($submission->timemodified, $newsubmission->timemodified);
// Assign override time checks.
$diff = $this->get_diff();
$this->assertEquals($override->duedate + $diff, $newoverride->duedate);
$this->assertEquals($override->cutoffdate + $diff, $newoverride->cutoffdate);
$this->assertEquals($override->allowsubmissionsfromdate + $diff, $newoverride->allowsubmissionsfromdate);
// Assign grade time checks.
$this->assertEquals($grade->timecreated, $newgrade->timecreated);
$this->assertEquals($grade->timemodified, $newgrade->timemodified);
}
}