mirror of
https://github.com/moodle/moodle.git
synced 2025-08-07 01:46:45 +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
|
@ -57,9 +57,10 @@ class restore_wiki_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->editbegin = $this->apply_date_offset($data->editbegin);
|
||||
$data->editend = $this->apply_date_offset($data->editend);
|
||||
$data->timemodified = $this->apply_date_offset($data->timemodified);
|
||||
|
||||
// insert the wiki record
|
||||
$newitemid = $DB->insert_record('wiki', $data);
|
||||
|
@ -101,9 +102,6 @@ class restore_wiki_activity_structure_step extends restore_activity_structure_st
|
|||
$oldid = $data->id;
|
||||
$data->subwikiid = $this->get_new_parentid('wiki_subwiki');
|
||||
$data->userid = $this->get_mappingid('user', $data->userid);
|
||||
$data->timemodified = $this->apply_date_offset($data->timemodified);
|
||||
$data->timecreated = $this->apply_date_offset($data->timecreated);
|
||||
$data->timerendered = $this->apply_date_offset($data->timerendered);
|
||||
|
||||
// Check that we were able to get a parentid for this page.
|
||||
if ($data->subwikiid !== false) {
|
||||
|
@ -122,7 +120,6 @@ class restore_wiki_activity_structure_step extends restore_activity_structure_st
|
|||
$oldid = $data->id;
|
||||
$data->pageid = $this->get_new_parentid('wiki_page');
|
||||
$data->userid = $this->get_mappingid('user', $data->userid);
|
||||
$data->timecreated = $this->apply_date_offset($data->timecreated);
|
||||
|
||||
$newitemid = $DB->insert_record('wiki_versions', $data);
|
||||
$this->set_mapping('wiki_version', $oldid, $newitemid);
|
||||
|
|
73
mod/wiki/tests/restore_date_test.php
Normal file
73
mod/wiki/tests/restore_date_test.php
Normal file
|
@ -0,0 +1,73 @@
|
|||
<?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_wiki
|
||||
* @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_wiki
|
||||
* @copyright 2017 onwards Ankit Agarwal <ankit.agrr@gmail.com>
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
class mod_wiki_restore_date_testcase extends restore_date_testcase {
|
||||
|
||||
/**
|
||||
* Test restore dates.
|
||||
*/
|
||||
public function test_restore_dates() {
|
||||
global $DB;
|
||||
|
||||
$record = ['editbegin' => 100, 'editend' => 100, 'timemodified' => 100];
|
||||
list($course, $wiki) = $this->create_course_and_module('wiki', $record);
|
||||
|
||||
$wikigenerator = $this->getDataGenerator()->get_plugin_generator('mod_wiki');
|
||||
$page = $wikigenerator->create_first_page($wiki);
|
||||
$version = $DB->get_record('wiki_versions', ['pageid' => $page->id, 'version' => 1]);
|
||||
|
||||
// Do backup and restore.
|
||||
$newcourseid = $this->backup_and_restore($course);
|
||||
$newwiki = $DB->get_record('wiki', ['course' => $newcourseid]);
|
||||
|
||||
$this->assertFieldsNotRolledForward($wiki, $newwiki, ['timecreated', 'timemodified']);
|
||||
$props = ['editend', 'editbegin'];
|
||||
$this->assertFieldsRolledForward($wiki, $newwiki, $props);
|
||||
|
||||
$newsubwiki = $DB->get_record('wiki_subwikis', ['wikiid' => $newwiki->id]);
|
||||
$newpage = $DB->get_record('wiki_pages', ['subwikiid' => $newsubwiki->id]);
|
||||
$newversion = $DB->get_record('wiki_versions', ['pageid' => $newpage->id, 'version' => 1]);
|
||||
|
||||
// Wiki page time checks.
|
||||
$this->assertEquals($page->timecreated, $newpage->timecreated);
|
||||
$this->assertEquals($page->timemodified, $newpage->timemodified);
|
||||
$this->assertEquals($page->timerendered, $newpage->timerendered);
|
||||
|
||||
// Wiki version time checks.
|
||||
$this->assertEquals($version->timecreated, $newversion->timecreated);
|
||||
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue