Permalink
Browse files

MDL-29690 mod_choice: Fixed regression from merge conflict

  • Loading branch information...
1 parent 1a75415 commit 3974508f3fbd03707e1029cb21c167b160d041f4 Sam Hemelryk committed Oct 10, 2011
Showing with 0 additions and 9 deletions.
  1. +0 −9 mod/choice/renderer.php
View
@@ -204,21 +204,12 @@ public function display_publish_name_vertical($choices) {
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'));

0 comments on commit 3974508

Please sign in to comment.