mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

MDL-40058 mod_wiki: modified wiki_restore_page api to accept version and context

Browse Source
This commit is contained in:
Rajesh Taneja 2013-12-03 14:42:49 +08:00 committed by Marina Glancy
parent e94f6c6572
commit 0e72987517
3 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mod/wiki/locallib.php
View File

@ -292,11 +292,27 @@ function wiki_refresh_cachedcontent($page, $newcontent = null) {
return array('page' => $page, 'sections' => $parseroutput['repeated_sections'], 'version' => $version->version);
}
/**
* Restore a page
* Restore a page with specified version.
*
* @param stdClass $wikipage wiki page record
* @param stdClass $version wiki page version to restore
* @param context_module $context context of wiki module
* @return stdClass restored page
*/
function wiki_restore_page($wikipage, $newcontent, $userid) {
$return = wiki_save_page($wikipage, $newcontent, $userid);
function wiki_restore_page($wikipage, $version, $context) {
$return = wiki_save_page($wikipage, $version->content, $version->userid);
$event = \mod_wiki\event\page_version_restored::create(
array(
'context' => $context,
'objectid' => $version->id,
'other' => array(
'pageid' => $wikipage->id
)
));
$event->add_record_snapshot('wiki_versions', $version);
$event->trigger();
return $return['page'];
}

12
mod/wiki/pagelib.php
View File

@ -2159,17 +2159,7 @@ class page_wiki_confirmrestore extends page_wiki_save {
require_capability('mod/wiki:managewiki', $this->modcontext, NULL, true, 'nomanagewikipermission', 'wiki');
$version = wiki_get_version($this->version->id);
if (wiki_restore_page($this->page, $version->content, $version->userid)) {
$event = \mod_wiki\event\page_version_restored::create(
array(
'context' => $this->modcontext,
'objectid' => $version->id,
'other' => array(
'pageid' => $this->page->id
)
));
$event->add_record_snapshot('wiki_versions', $version);
$event->trigger();
if (wiki_restore_page($this->page, $version, $this->modcontext)) {
redirect($CFG->wwwroot . '/mod/wiki/view.php?pageid=' . $this->page->id, get_string('restoring', 'wiki', $version->version), 3);
} else {
print_error('restoreerror', 'wiki', $version->version);

23
mod/wiki/tests/events_test.php
View File

@ -147,7 +147,7 @@ class mod_wiki_events_testcase extends advanced_testcase {
/**
* Test instances_list_viewed event.
*/
public function test_instances_list_viewed() {
public function test_course_module_instance_list_viewed() {
// There is no proper API to call or trigger this event, so simulating event
// to check if event returns the right information.
@ -155,7 +155,7 @@ class mod_wiki_events_testcase extends advanced_testcase {
$context = context_course::instance($this->course->id);
$params = array('context' => $context);
$event = \mod_wiki\event\instances_list_viewed::create($params);
$event = \mod_wiki\event\course_module_instance_list_viewed::create($params);
// Triggering and capturing the event.
$sink = $this->redirectEvents();
@ -165,7 +165,7 @@ class mod_wiki_events_testcase extends advanced_testcase {
$event = reset($events);
// Checking that the event contains the expected values.
$this->assertInstanceOf('\mod_wiki\event\instances_list_viewed', $event);
$this->assertInstanceOf('\mod_wiki\event\course_module_instance_list_viewed', $event);
$this->assertEquals($context, $event->get_context());
$expected = array($this->course->id, 'wiki', 'view all', 'index.php?id=' . $this->course->id, '');
$this->assertEventLegacyLogData($expected, $event);
@ -534,29 +534,18 @@ class mod_wiki_events_testcase extends advanced_testcase {
* Test page_version_restored event.
*/
public function test_page_version_restored() {
// There is no proper API to call or trigger this event, so simulating event
// to check if event returns the right information.
$this->setUp();
$page = $this->wikigenerator->create_first_page($this->wiki);
$context = context_module::instance($this->wiki->cmid);
$version = wiki_get_version(1);
$params = array(
'context' => $context,
'objectid' => $version->id,
'other' => array(
'pageid' => $page->id
)
);
$event = \mod_wiki\event\page_version_restored::create($params);
// Triggering and capturing the event.
$sink = $this->redirectEvents();
$event->trigger();
wiki_restore_page($page, $version, $context);
$events = $sink->get_events();
$this->assertCount(1, $events);
$event = reset($events);
$this->assertCount(2, $events);
$event = array_pop($events);
// Checking that the event contains the expected values.
$this->assertInstanceOf('\mod_wiki\event\page_version_restored', $event);