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

MDL-35776 user ajax: fix sort order in chrome.

Browse Source 
It seems that Chrome orders fields of objects in order of array key.
Therefore we must stop using user.id in the PHP arrays, and instead
ensure that we use sequential numbers.

This commit fixes the user selector.

Conflicts:
	user/selector/module.js
	user/selector/search.php
This commit is contained in:
Tim Hunt
2012-10-03 19:16:41 +01:00
parent 1c61cadaaf
commit d06a987343
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/selector/module.js
+8 -6
View File
@@ -221,8 +221,9 @@ M.core_user.init_user_selector = function (Y, name, hash, extrafields, lastsearc
// Output each optgroup.
var count = 0;
for (var groupname in data.results) {
this.output_group(groupname, data.results[groupname], selectedusers, true);
for (var key in data.results) {
var groupdata = data.results[key];
this.output_group(groupdata.name, groupdata.users, selectedusers, true);
count++;
}
if (!count) {
@@ -248,13 +249,14 @@ M.core_user.init_user_selector = function (Y, name, hash, extrafields, lastsearc
output_group : function(groupname, users, selectedusers, processsingle) {
var optgroup = Y.Node.create('<optgroup></optgroup>');
var count = 0;
for (var userid in users) {
var user = users[userid];
var option = Y.Node.create('<option value="'+userid+'">'+user.name+'</option>');
for (var key in users) {
var user = users[key];
var option = Y.Node.create('<option value="'+user.id+'">'+user.name+'</option>');
if (user.disabled) {
option.set('disabled', true);
} else if (selectedusers===true || selectedusers[userid]) {
} else if (selectedusers===true || selectedusers[user.id]) {
option.set('selected', true);
delete selectedusers[user.id];
} else {
option.set('selected', false);
}
user/selector/search.php
+8 -5
View File
@@ -78,17 +78,20 @@ if (isset($options['file'])) {
$userselector = new $classname($name, $options);
// Do the search and output the results.
$users = $userselector->find_users($search);
foreach ($users as &$group) {
foreach ($group as $user) {
$results = $userselector->find_users($search);
$json = array();
foreach ($results as $groupname => $users) {
$groupdata = array('name' => $groupname, 'users' => array());
foreach ($users as $user) {
$output = new stdClass;
$output->id = $user->id;
$output->name = $userselector->output_user($user);
if (!empty($user->disabled)) {
$output->disabled = true;
}
$group[$user->id] = $output;
$groupdata['users'][] = $output;
}
$json[] = $groupdata;
}
echo json_encode(array('results' => $users));
echo json_encode(array('results' => $json));