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

MDL-29690 mod_choice: Fixed regression from merge conflict

Browse Source
This commit is contained in:
Sam Hemelryk
2011-10-10 16:48:57 +13:00
parent 1a7541517c
commit 3974508f3f
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/choice/renderer.php
-9
View File
@@ -204,21 +204,12 @@ class mod_choice_renderer extends plugin_renderer_base {
if ($choices->viewresponsecapability && $choices->deleterepsonsecapability) {
$selecturl = new moodle_url('#');
<<<<<<< HEAD
$selectallactions = new component_action('click',"select_all_in", array('div',null,'tablecontainer'));
$selectall = new action_link($selecturl, get_string('selectall', 'quiz'), $selectallactions);
$actiondata .= $this->output->render($selectall) . ' / ';
$deselectallactions = new component_action('click',"deselect_all_in", array('div',null,'tablecontainer'));
$deselectall = new action_link($selecturl, get_string('selectnone', 'quiz'), $deselectallactions);
=======
$selectallactions = new component_action('click',"checkall");
$selectall = new action_link($selecturl, get_string('selectall'), $selectallactions);
$actiondata .= $this->output->render($selectall) . ' / ';
$deselectallactions = new component_action('click',"checknone");
$deselectall = new action_link($selecturl, get_string('deselectall'), $deselectallactions);
>>>>>>> c9b8a78... MDL-29690 fix usage of select all/deselect all in choice reports
$actiondata .= $this->output->render($deselectall);
$actiondata .= html_writer::tag('label', ' ' . get_string('withselected', 'quiz') . ' ', array('for'=>'menuaction'));