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

7
mod/glossary/backup/moodle2/restore_glossary_stepslib.php
View file

@ -58,6 +58,8 @@ class restore_glossary_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->assesstimestart = $this->apply_date_offset($data->assesstimestart);
$data->assesstimefinish = $this->apply_date_offset($data->assesstimefinish);
if ($data->scale < 0) { // scale found, get mapping
@ -88,9 +90,6 @@ class restore_glossary_activity_structure_step extends restore_activity_structur
$data->userid = $this->get_mappingid('user', $data->userid);
$data->sourceglossaryid = $this->get_mappingid('glossary', $data->sourceglossaryid);
$data->timecreated = $this->apply_date_offset($data->timecreated);
$data->timemodified = $this->apply_date_offset($data->timemodified);
// insert the entry record
$newitemid = $DB->insert_record('glossary_entries', $data);
$this->set_mapping('glossary_entry', $oldid, $newitemid, true); // childs and files by itemname
@ -120,8 +119,6 @@ class restore_glossary_activity_structure_step extends restore_activity_structur
}
$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);
// Make sure that we have both component and ratingarea set. These were added in 2.1.
// Prior to that all ratings were for entries so we know what to set them too.

2
mod/glossary/lib.php
View file

@ -3016,6 +3016,8 @@ function glossary_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('glossary', array('assesstimestart', 'assesstimefinish'), $data->timeshift, $data->courseid);
$status[] = array('component'=>$componentstr, 'item'=>get_string('datechanged'), 'error'=>false);
}

91
mod/glossary/tests/restore_date_test.php Normal file
View file

@ -0,0 +1,91 @@
<?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_glossary
* @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_glossary
* @copyright 2017 onwards Ankit Agarwal <ankit.agrr@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class mod_glossary_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_glossary');
$record = ['assesstimefinish' => 100, 'assesstimestart' => 100, 'ratingtime' => 1, 'assessed' => 2, 'scale' => 1];
list($course, $glossary) = $this->create_course_and_module('glossary', $record);
// Glossary entries.
$entry1 = $gg->create_content($glossary, array('approved' => 1));
$gg->create_content($glossary, array('approved' => 0, 'userid' => $USER->id));
$gg->create_content($glossary, array('approved' => 0, 'userid' => -1));
$gg->create_content($glossary, array('approved' => 1));
$timestamp = 10000;
$DB->set_field('glossary_entries', 'timecreated', $timestamp);
$DB->set_field('glossary_entries', 'timemodified', $timestamp);
$ratingoptions = new stdClass;
$ratingoptions->context = context_module::instance($glossary->cmid);
$ratingoptions->ratingarea = 'entry';
$ratingoptions->component = 'mod_glossary';
$ratingoptions->itemid = $entry1->id;
$ratingoptions->scaleid = 2;
$ratingoptions->userid = $USER->id;
$rating = new rating($ratingoptions);
$rating->update_rating(2);
$rating = $DB->get_record('rating', ['itemid' => $entry1->id]);
// Do backup and restore.
$newcourseid = $this->backup_and_restore($course);
$newglossary = $DB->get_record('glossary', ['course' => $newcourseid]);
$this->assertFieldsNotRolledForward($glossary, $newglossary, ['timecreated', 'timemodified']);
$props = ['assesstimefinish', 'assesstimestart'];
$this->assertFieldsRolledForward($glossary, $newglossary, $props);
$newentries = $DB->get_records('glossary_entries', ['glossaryid' => $newglossary->id]);
$newcm = $DB->get_record('course_modules', ['course' => $newcourseid, 'instance' => $newglossary->id]);
// Entries test.
foreach ($newentries as $entry) {
$this->assertEquals($timestamp, $entry->timecreated);
$this->assertEquals($timestamp, $entry->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);
}
}