moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +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

5
mod/choice/backup/moodle2/restore_choice_stepslib.php
View file

@ -53,9 +53,10 @@ class restore_choice_activity_structure_step extends restore_activity_structure_
$oldid = $data->id;
$data->course = $this->get_courseid();
// 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->timeopen = $this->apply_date_offset($data->timeopen);
$data->timeclose = $this->apply_date_offset($data->timeclose);
$data->timemodified = $this->apply_date_offset($data->timemodified);
// insert the choice record
$newitemid = $DB->insert_record('choice', $data);
@ -70,7 +71,6 @@ class restore_choice_activity_structure_step extends restore_activity_structure_
$oldid = $data->id;
$data->choiceid = $this->get_new_parentid('choice');
$data->timemodified = $this->apply_date_offset($data->timemodified);
$newitemid = $DB->insert_record('choice_options', $data);
$this->set_mapping('choice_option', $oldid, $newitemid);
@ -84,7 +84,6 @@ class restore_choice_activity_structure_step extends restore_activity_structure_
$data->choiceid = $this->get_new_parentid('choice');
$data->optionid = $this->get_mappingid('choice_option', $data->optionid);
$data->userid = $this->get_mappingid('user', $data->userid);
$data->timemodified = $this->apply_date_offset($data->timemodified);
$newitemid = $DB->insert_record('choice_answers', $data);
// No need to save this mapping as far as nothing depend on it

2
mod/choice/lib.php
View file

@ -754,6 +754,8 @@ function choice_reset_userdata($data) {
/// updating dates - shift may be negative too
if ($data->timeshift) {
// 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('choice', array('timeopen', 'timeclose'), $data->timeshift, $data->courseid);
$status[] = array('component'=>$componentstr, 'item'=>get_string('datechanged'), 'error'=>false);
}

71
mod/choice/tests/restore_date_test.php Normal file
View file

@ -0,0 +1,71 @@
<?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_choice
* @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");
/**
* Restore date tests.
*
* @package mod_choice
* @copyright 2017 onwards Ankit Agarwal <ankit.agrr@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_choice_restore_date_testcase extends restore_date_testcase {
public function test_restore_dates() {
global $DB, $USER;
$time = 100000;
$record = ['timeopen' => $time, 'timeclose' => $time];
list($course, $choice) = $this->create_course_and_module('choice', $record);
$options = $DB->get_records('choice_options', ['choiceid' => $choice->id]);
$DB->set_field('choice_options', 'timemodified', $time);
$option = reset($options);
$cm = $DB->get_record('course_modules', ['id' => $choice->cmid]);
choice_user_submit_response($option->id, $choice, $USER->id, $course, $cm);
$answer = $DB->get_record('choice_answers', ['choiceid' => $choice->id]);
// Do backup and restore.
$newcourseid = $this->backup_and_restore($course);
$newchoice = $DB->get_record('choice', ['course' => $newcourseid]);
$newoptions = $DB->get_records('choice_options', ['choiceid' => $newchoice->id]);
$this->assertFieldsNotRolledForward($choice, $newchoice, ['timemodified']);
$props = ['timeopen', 'timeclose'];
$this->assertFieldsRolledForward($choice, $newchoice, $props);
// Options check.
foreach ($newoptions as $newoption) {
$this->assertEquals($time, $newoption->timemodified);
}
// Answers check.
$newanswer = $DB->get_record('choice_answers', ['choiceid' => $newchoice->id]);
$this->assertEquals($answer->timemodified, $newanswer->timemodified);
}
}