mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 08:56:36 +02:00
MDL-9367 restore: Roll only configuration dates
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:
parent
d509f80c48
commit
0d14fcbc60
57 changed files with 1617 additions and 74 deletions
|
@ -52,8 +52,9 @@ class restore_survey_activity_structure_step extends restore_activity_structure_
|
|||
$data = (object)$data;
|
||||
$oldid = $data->id;
|
||||
$data->course = $this->get_courseid();
|
||||
$data->timemodified = $this->apply_date_offset($data->timemodified);
|
||||
$data->timecreated = $this->apply_date_offset($data->timecreated);
|
||||
|
||||
// Any changes to the list of dates that needs to be rolled should be same during course restore and course reset.
|
||||
// See MDL-9367.
|
||||
|
||||
// insert the survey record
|
||||
$newitemid = $DB->insert_record('survey', $data);
|
||||
|
@ -81,7 +82,6 @@ class restore_survey_activity_structure_step extends restore_activity_structure_
|
|||
$oldid = $data->id;
|
||||
$data->survey = $this->get_new_parentid('survey');
|
||||
$data->userid = $this->get_mappingid('user', $data->userid);
|
||||
$data->time = $this->apply_date_offset($data->time);
|
||||
|
||||
$newitemid = $DB->insert_record('survey_answers', $data);
|
||||
// No need to save this mapping as far as nothing depend on it
|
||||
|
|
|
@ -762,7 +762,10 @@ function survey_reset_userdata($data) {
|
|||
$status[] = array('component'=>$componentstr, 'item'=>get_string('deleteallanswers', 'survey'), 'error'=>false);
|
||||
}
|
||||
|
||||
// no date shifting
|
||||
// No date shifting.
|
||||
// Any changes to the list of dates that needs to be rolled should be same during course restore and course reset.
|
||||
// See MDL-9367.
|
||||
|
||||
return $status;
|
||||
}
|
||||
|
||||
|
|
79
mod/survey/tests/restore_date_test.php
Normal file
79
mod/survey/tests/restore_date_test.php
Normal file
|
@ -0,0 +1,79 @@
|
|||
<?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_survey
|
||||
* @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_survey
|
||||
* @copyright 2017 onwards Ankit Agarwal <ankit.agrr@gmail.com>
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
class mod_survey_restore_date_testcase extends restore_date_testcase {
|
||||
|
||||
public function test_restore_dates() {
|
||||
global $DB;
|
||||
|
||||
list($course, $survey) = $this->create_course_and_module('survey');
|
||||
$context = context_module::instance($survey->cmid);
|
||||
|
||||
// Build our questions and responses array.
|
||||
$realquestions = array();
|
||||
$questions = survey_get_questions($survey);
|
||||
$i = 5;
|
||||
foreach ($questions as $q) {
|
||||
if ($q->type > 0) {
|
||||
if ($q->multi) {
|
||||
$subquestions = survey_get_subquestions($q);
|
||||
foreach ($subquestions as $sq) {
|
||||
$key = 'q' . $sq->id;
|
||||
$realquestions[$key] = $i % 5 + 1;
|
||||
$i++;
|
||||
}
|
||||
} else {
|
||||
$key = 'q' . $q->id;
|
||||
$realquestions[$key] = $i % 5 + 1;
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
}
|
||||
survey_save_answers($survey, $realquestions, $course, $context);
|
||||
// We do not want second differences to fail our test because of execution delays.
|
||||
$DB->set_field('survey_answers', 'time', $this->startdate);
|
||||
|
||||
// Do backup and restore.
|
||||
$newcourseid = $this->backup_and_restore($course);
|
||||
$newsurvey = $DB->get_record('survey', ['course' => $newcourseid]);
|
||||
$this->assertFieldsNotRolledForward($survey, $newsurvey, ['timecreated', 'timemodified']);
|
||||
|
||||
$answers = $DB->get_records('survey_answers', ['survey' => $newsurvey->id]);
|
||||
foreach ($answers as $answer) {
|
||||
$this->assertEquals($this->startdate, $answer->time);
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue