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

9
mod/data/backup/moodle2/restore_data_stepslib.php
View file

@ -55,14 +55,14 @@ class restore_data_activity_structure_step extends restore_activity_structure_st
$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->timeavailablefrom = $this->apply_date_offset($data->timeavailablefrom);
$data->timeavailableto = $this->apply_date_offset($data->timeavailableto);
$data->timeviewfrom = $this->apply_date_offset($data->timeviewfrom);
$data->timeviewto = $this->apply_date_offset($data->timeviewto);
$data->assesstimestart = $this->apply_date_offset($data->assesstimestart);
$data->assesstimefinish = $this->apply_date_offset($data->assesstimefinish);
// Added in 3.1, hence conditional.
$data->timemodified = isset($data->timemodified) ? $this->apply_date_offset($data->timemodified) : time();
if ($data->scale < 0) { // scale found, get mapping
$data->scale = -($this->get_mappingid('scale', abs($data->scale)));
@ -98,9 +98,6 @@ class restore_data_activity_structure_step extends restore_activity_structure_st
$data = (object)$data;
$oldid = $data->id;
$data->timecreated = $this->apply_date_offset($data->timecreated);
$data->timemodified = $this->apply_date_offset($data->timemodified);
$data->userid = $this->get_mappingid('user', $data->userid);
$data->groupid = $this->get_mappingid('group', $data->groupid);
$data->dataid = $this->get_new_parentid('data');
@ -137,8 +134,6 @@ class restore_data_activity_structure_step extends restore_activity_structure_st
}
$data->rating = $data->value;
$data->userid = $this->get_mappingid('user', $data->userid);
$data->timecreated = $this->apply_date_offset($data->timecreated);
$data->timemodified = $this->apply_date_offset($data->timemodified);
// We need to check that component and ratingarea are both set here.
if (empty($data->component)) {

5
mod/data/lib.php
View file

@ -2872,7 +2872,10 @@ function data_reset_userdata($data) {
// updating dates - shift may be negative too
if ($data->timeshift) {
shift_course_mod_dates('data', array('timeavailablefrom', 'timeavailableto', 'timeviewfrom', 'timeviewto'), $data->timeshift, $data->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.
shift_course_mod_dates('data', array('timeavailablefrom', 'timeavailableto',
'timeviewfrom', 'timeviewto', 'assesstimestart', 'assesstimefinish'), $data->timeshift, $data->courseid);
$status[] = array('component'=>$componentstr, 'item'=>get_string('datechanged'), 'error'=>false);
}

93
mod/data/tests/restore_date_test.php Normal file
View file

@ -0,0 +1,93 @@
<?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_data
* @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 . '/rating/lib.php');
/**
* Restore date tests.
*
* @package mod_data
* @copyright 2017 onwards Ankit Agarwal <ankit.agrr@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_data_restore_date_testcase extends restore_date_testcase {
/**
* Test restore dates.
*/
public function test_restore_dates() {
global $DB, $USER;
$gg = $this->getDataGenerator()->get_plugin_generator('mod_data');
$record = ['assesstimefinish' => 100, 'assesstimestart' => 100, 'ratingtime' => 1, 'assessed' => 2, 'scale' => 1,
'timeavailablefrom' => 100, 'timeavailableto' => 100, 'timeviewfrom' => 100, 'timeviewto' => 100];
list($course, $data) = $this->create_course_and_module('data', $record);
// Data field/record.
$timestamp = 996699;
$diff = $this->get_diff();
$record = new StdClass();
$record->name = 'field-1';
$record->type = 'text';
$field = $gg->create_field($record, $data);
$datarecordid = $gg->create_entry($data, [$field->field->id => 'NERDS NERDS EVERYWHERE, NO BRAIN TO THINK']);
$datarecord = $DB->get_record('data_records', ['id' => $datarecordid]);
// Ratings.
$ratingoptions = new stdClass;
$ratingoptions->context = context_module::instance($data->cmid);
$ratingoptions->ratingarea = 'entry';
$ratingoptions->component = 'mod_data';
$ratingoptions->itemid = $datarecord->id;
$ratingoptions->scaleid = 2;
$ratingoptions->userid = $USER->id;
$rating = new rating($ratingoptions);
$rating->update_rating(2);
$rating = $DB->get_record('rating', ['itemid' => $datarecord->id]);
// Do backup and restore.
$newcourseid = $this->backup_and_restore($course);
$newdata = $DB->get_record('data', ['course' => $newcourseid]);
$this->assertFieldsNotRolledForward($data, $newdata, ['timemodified']);
$props = ['assesstimefinish', 'assesstimestart', 'timeavailablefrom', 'timeavailableto', 'timeviewfrom', 'timeviewto'];
$this->assertFieldsRolledForward($data, $newdata, $props);
$newdatarecord = $DB->get_record('data_records', ['dataid' => $newdata->id]);
$newcm = $DB->get_record('course_modules', ['course' => $newcourseid, 'instance' => $newdata->id]);
// Data record time checks.
$this->assertEquals($datarecord->timecreated, $newdatarecord->timecreated);
$this->assertEquals($datarecord->timemodified, $newdatarecord->timemodified);
// Rating test.
$newrating = $DB->get_record('rating', ['contextid' => context_module::instance($newcm->id)->id]);
$this->assertEquals($rating->timecreated, $newrating->timecreated);
$this->assertEquals($rating->timemodified, $newrating->timemodified);
}
}