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

MDL-47494 ddmarker: NOBUG change API calls that only work post 2.1

Browse Source 
This need to be merged into master branch because we want to keep the
2.1 branch mergeable but then we will merge with 'ours' strategy,
effectively discarding changes.
This commit is contained in:
Jamie Pratt
2012-03-27 17:32:51 +07:00
parent 5e37b1f0f7
commit 2379439f63
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/type/ddmarker/imagetargetconverter.php
+12 -6
View File
@@ -99,7 +99,7 @@ class qtype_ddmarker_category_list_item extends qtype_ddmarker_list_item {
$actionurl = new moodle_url($PAGE->url, array('categoryid'=> $this->record->id));
$thisitem = html_writer::tag('a', $thisitem, array('href' => $actionurl));
}
return $thisitem.$this->render_children($stringidentifier, $link);
}
}
@@ -126,7 +126,7 @@ class qtype_ddmarker_context_list_item extends qtype_ddmarker_list_item {
global $PAGE;
$a = new stdClass();
$a->qcount = $this->qcount;
$a->name = $this->record->get_context_name();
$a->name = print_context_name($this->record);
$thisitem = get_string($stringidentifier.'context', 'qtype_ddmarker', $a);
if ($link) {
$actionurl = new moodle_url($PAGE->url, array('contextid'=> $this->record->id));
@@ -170,10 +170,16 @@ class qtype_ddmarker_context_list extends qtype_ddmarker_list {
global $DB;
$this->records = array();
foreach ($contextids as $contextid) {
if (!isset($records[$contextid])) {
$this->records[$contextid] = context::instance_by_id($contextid);
if (!isset($this->records[$contextid])) {
$this->records[$contextid] = get_context_instance_by_id($contextid, MUST_EXIST);
}
$parents = get_parent_contexts($this->records[$contextid]);
foreach ($parents as $parentcontextid) {
if (!isset($this->records[$parentcontextid])) {
$this->records[$parentcontextid] =
get_context_instance_by_id($parentcontextid, MUST_EXIST);
}
}
$this->records += $this->records[$contextid]->get_parent_contexts();
}
parent::make_list_item_instances_from_records ($contextids);
}
@@ -271,7 +277,7 @@ if ($categoryid || $qcontextid) {
echo $contexts->render('listitem', false, $torender);
echo $OUTPUT->confirm(get_string('confirmimagetargetconversion', 'qtype_ddmarker'), $cofirmedurl, $cancelurl);
} else if (confirm_sesskey()) {
}
} else {
echo $contexts->render('listitemaction', true, $contexts->root_node());