L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-22414 Fixed the order of course modules in the restored course

Browse Source 
During the restore, the section's sequence field is ignored and the
order of modules is controlled by the order of the <contents> activity
elements. This patch makes sure that the modules are listed in that
section in the right order.

Also, the patch removes the obsolete stash sectionidslist which was
introduced when the method get_stash_itemids() had not existed yet.
This commit is contained in:
David Mudrak
2011-06-09 02:41:27 +02:00
parent 30d5190a9b
commit 4ece48dc36
2 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backup/converter/moodle1/handlerlib.php
+35 -29
View File
@@ -373,35 +373,34 @@ class moodle1_root_handler extends moodle1_xml_handler {
// moodle_backup/information/contents/activities
$this->xmlwriter->begin_tag('activities');
$activitysettings = array();
foreach ($this->converter->get_stash('modnameslist') as $modname) {
$modinfo = $this->converter->get_stash('modinfo_'.$modname);
foreach ($modinfo['instances'] as $modinstanceid => $modinstance) {
$cminfo = $this->converter->get_stash('cminfo_'.$modname, $modinstanceid);
$activitysettings[] = array(
'level' => 'activity',
'activity' => $cminfo['modulename'].'_'.$cminfo['id'],
'name' => $cminfo['modulename'].'_'.$cminfo['id'].'_included',
'value' => (($modinfo['included'] === 'true' and $modinstance['included'] === 'true') ? 1 : 0));
$activitysettings[] = array(
'level' => 'activity',
'activity' => $cminfo['modulename'].'_'.$cminfo['id'],
'name' => $cminfo['modulename'].'_'.$cminfo['id'].'_userinfo',
'value' => (($modinfo['userinfo'] === 'true' and $modinstance['userinfo'] === 'true') ? 1 : 0));
$this->write_xml('activity', array(
'moduleid' => $cminfo['id'],
'sectionid' => $cminfo['sectionid'],
'modulename' => $cminfo['modulename'],
'title' => $modinstance['name'],
'directory' => 'activities/'.$cminfo['modulename'].'_'.$cminfo['id']));
}
foreach ($this->converter->get_stash('coursecontents') as $activity) {
$modinfo = $this->converter->get_stash('modinfo_'.$activity['modulename']);
$modinstance = $modinfo['instances'][$activity['instanceid']];
$this->write_xml('activity', array(
'moduleid' => $activity['cmid'],
'sectionid' => $activity['sectionid'],
'modulename' => $activity['modulename'],
'title' => $modinstance['name'],
'directory' => 'activities/'.$activity['modulename'].'_'.$activity['cmid']
));
$activitysettings[] = array(
'level' => 'activity',
'activity' => $activity['modulename'].'_'.$activity['cmid'],
'name' => $activity['modulename'].'_'.$activity['cmid'].'_included',
'value' => (($modinfo['included'] === 'true' and $modinstance['included'] === 'true') ? 1 : 0));
$activitysettings[] = array(
'level' => 'activity',
'activity' => $activity['modulename'].'_'.$activity['cmid'],
'name' => $activity['modulename'].'_'.$activity['cmid'].'_userinfo',
//'value' => (($modinfo['userinfo'] === 'true' and $modinstance['userinfo'] === 'true') ? 1 : 0));
'value' => 0); // todo hardcoded non-userinfo for now
}
$this->xmlwriter->end_tag('activities');
// moodle_backup/information/contents/sections
$this->xmlwriter->begin_tag('sections');
$sectionsettings = array();
foreach ($this->converter->get_stash('sectionidslist') as $sectionid) {
foreach ($this->converter->get_stash_itemids('sectioninfo') as $sectionid) {
$sectioninfo = $this->converter->get_stash('sectioninfo', $sectionid);
$sectionsettings[] = array(
'level' => 'section',
@@ -764,8 +763,8 @@ class moodle1_course_header_handler extends moodle1_xml_handler {
*/
class moodle1_course_outline_handler extends moodle1_xml_handler {
/** @var array list of section ids */
protected $sectionids = array();
/** @var array ordered list of the course contents */
protected $coursecontents = array();
/** @var array current section data */
protected $currentsection;
@@ -817,7 +816,6 @@ class moodle1_course_outline_handler extends moodle1_xml_handler {
}
public function process_course_section($data) {
$this->sectionids[] = $data['id'];
$this->currentsection = $data;
}
@@ -828,6 +826,15 @@ class moodle1_course_outline_handler extends moodle1_xml_handler {
public function process_course_module($data, $raw) {
global $CFG;
// add the course module into the course contents list
$this->coursecontents[$data['id']] = array(
'cmid' => $data['id'],
'instanceid' => $raw['INSTANCE'],
'sectionid' => $this->currentsection['id'],
'modulename' => $data['modulename'],
'title' => null
);
// add the course module id into the section's sequence
if (is_null($this->currentsection['sequence'])) {
$this->currentsection['sequence'] = $data['id'];
@@ -892,11 +899,10 @@ class moodle1_course_outline_handler extends moodle1_xml_handler {
}
/**
* Stashes the list of section ids
* Stashes the course contents
*/
public function on_course_sections_end() {
$this->converter->set_stash('sectionidslist', $this->sectionids);
unset($this->sectionids);
$this->converter->set_stash('coursecontents', $this->coursecontents);
}
/**
mod/resource/backup/moodle1/lib.php
+5
View File
@@ -120,6 +120,11 @@ class moodle1_mod_resource_handler extends moodle1_mod_handler {
$cminfo['modulename'] = $successor->get_modname();
$this->converter->set_stash('cminfo_'.$cminfo['modulename'], $cminfo, $instanceid);
// rewrite the coursecontents stash
$coursecontents = $this->converter->get_stash('coursecontents');
$coursecontents[$cminfo['id']]['modulename'] = $successor->get_modname();
$this->converter->set_stash('coursecontents', $coursecontents);
// delegate the processing to the successor handler
return $successor->process_legacy_resource($data, $raw);
}