Skip to content

Commit 125b510

Browse files
committed
#362 - remove YUI code; simplified javascript part
1 parent 95b090a commit 125b510

3 files changed

Lines changed: 14 additions & 67 deletions

File tree

classes/output/renderer.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ public function index_page(moodleform $mform, int $step, ?user_select_table $ust
136136
$output .= $this->moodleform($mform);
137137
// Render user select table if available.
138138
if ($ust !== null) {
139-
$this->page->requires->js_init_call('M.tool_mergeusers.init_select_table', []);
140139
$output .= $this->render_user_select_table($ust);
141140
}
142141
break;

classes/output/user_select_table.php

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ protected function build_table_for(array $users): void {
7676
$this->attributes['class'] = 'generaltable boxaligncenter';
7777

7878
$columns = [
79-
'col_reset' => get_string('reset'),
8079
'col_select_olduser' => get_string('olduser', 'tool_mergeusers'),
8180
'col_master_newuser' => get_string('newuser', 'tool_mergeusers'),
8281
'col_userid' => 'Id',
@@ -92,22 +91,25 @@ protected function build_table_for(array $users): void {
9291
foreach ($users as $userid => $user) {
9392
$row = [];
9493
$spanclass = ($user->suspended) ? ('usersuspended') : ('');
95-
$row[] = html_writer::tag(
96-
'a',
97-
$reset,
98-
[
99-
'href' => "javascript:rbo=document.getElementById('olduser$userid'); " .
100-
"rbn=document.getElementById('newuser$userid'); " .
101-
"rbo.checked=false; rbn.checked=false; rbo.disabled=false; rbn.disabled=false;",
102-
],
103-
);
10494
$row[] = html_writer::empty_tag(
10595
'input',
106-
['type' => 'radio', 'name' => 'olduser', 'value' => $userid, 'id' => 'olduser' . $userid],
96+
[
97+
'type' => 'radio',
98+
'name' => 'olduser',
99+
'value' => $userid,
100+
'id' => 'olduser' . $userid,
101+
'onClick' => "document.getElementsByName('selectedolduser')[0].value = this.value;",
102+
],
107103
);
108104
$row[] = html_writer::empty_tag(
109105
'input',
110-
['type' => 'radio', 'name' => 'newuser', 'value' => $userid, 'id' => 'newuser' . $userid],
106+
[
107+
'type' => 'radio',
108+
'name' => 'newuser',
109+
'value' => $userid,
110+
'id' => 'newuser' . $userid,
111+
'onClick' => "document.getElementsByName('selectednewuser')[0].value = this.value;",
112+
],
111113
);
112114
$row[] = html_writer::tag('span', $user->id, ['class' => $spanclass]);
113115
$row[] = $this->renderer->show_user($user->id, $user);

module.js

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)