moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +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

2
mod/feedback/backup/moodle1/lib.php
View file

@ -93,6 +93,8 @@ class moodle1_mod_feedback_handler extends moodle1_mod_handler {
$this->moduleid = $cminfo['id'];
$contextid = $this->converter->get_contextid(CONTEXT_MODULE, $this->moduleid);
// get a fresh new file manager for this instance
$this->fileman = $this->converter->get_file_manager($contextid, 'mod_feedback');

4
mod/feedback/backup/moodle2/restore_feedback_stepslib.php
View file

@ -53,9 +53,10 @@ class restore_feedback_activity_structure_step extends restore_activity_structur
$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 feedback record
$newitemid = $DB->insert_record('feedback', $data);
@ -84,7 +85,6 @@ class restore_feedback_activity_structure_step extends restore_activity_structur
$oldid = $data->id;
$data->feedback = $this->get_new_parentid('feedback');
$data->userid = $this->get_mappingid('user', $data->userid);
$data->timemodified = $this->apply_date_offset($data->timemodified);
if ($this->task->is_samesite() && !empty($data->courseid)) {
$data->courseid = $data->courseid;
} else if ($this->get_courseid() == SITEID) {

2
mod/feedback/lib.php
View file

@ -695,6 +695,8 @@ function feedback_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.
$shifterror = !shift_course_mod_dates('feedback', array('timeopen', 'timeclose'), $data->timeshift, $data->courseid);
$status[] = array('component' => $componentstr, 'item' => get_string('datechanged'), 'error' => $shifterror);
}

64
mod/feedback/tests/restore_date_test.php Normal file
View file

@ -0,0 +1,64 @@
<?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_feedback
* @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_feedback
* @copyright 2017 onwards Ankit Agarwal <ankit.agrr@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_feedback_restore_date_testcase extends restore_date_testcase {
public function test_restore_dates() {
global $DB, $USER;
$time = 10000;
list($course, $feedback) = $this->create_course_and_module('feedback', ['timeopen' => $time, 'timeclose' => $time]);
// Create response.
$response = new stdClass();
$response->feedback = $feedback->id;
$response->userid = $USER->id;
$response->anonymous_response = FEEDBACK_ANONYMOUS_NO;
$response->timemodified = $time;
$completedid = $DB->insert_record('feedback_completed', $response);
$response = $DB->get_record('feedback_completed', array('id' => $completedid), '*', MUST_EXIST);
// Do backup and restore.
$newcourseid = $this->backup_and_restore($course);
$newfeedback = $DB->get_record('feedback', ['course' => $newcourseid]);
$newresponse = $DB->get_record('feedback_completed', ['feedback' => $newfeedback->id]);
$this->assertFieldsNotRolledForward($feedback, $newfeedback, ['timemodified']);
$props = ['timeopen', 'timeclose'];
$this->assertFieldsRolledForward($feedback, $newfeedback, $props);
$this->assertEquals($response->timemodified, $newresponse->timemodified);
}
}