adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-06 16:53:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

related to #1537 Php filterable_users list made better

Browse Source
This commit is contained in:
Matthieu Leproux
2021-10-22 15:30:39 +02:00
parent ad62cfd16a
commit f0608bb9fa
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/themes/default/template/user_activity.tpl
+2 -2
View File
@@ -124,11 +124,11 @@ function get_user_activity() {
})
}
function fillUserFilter(user_tab, id_of) {
function fillUserFilter(user_tab) {
for (const [key, value] of Object.entries(user_tab)) {
{* console.log(key, value); *}
var newOption = "<option value=" + id_of[key] +"> <span class='username_filter'>" + key + "</span> <span class='nb_lines_str'> (" + lines_key.replace("%s", value) + ") </span></option>";
var newOption = "<option value=" + value.id +"> <span class='username_filter'>" + value.username + "</span> <span class='nb_lines_str'> (" + lines_key.replace("%s", value.nb_lines) + ") </span></option>";
$(".user-selecter").append(newOption);
}
include/ws_functions/pwg.php
+20 -14
View File
@@ -537,32 +537,38 @@ SELECT
{
if (isset($username_of[$key]))
{
$filterable_users[$username_of[$key]] = $value;
array_push(
$filterable_users,
array(
'id' => $key,
'username' => $username_of[$key],
'nb_lines' => $value,
)
);
}
else
{
$filterable_users['user#'.$key] = $value;
array_push(
$filterable_users,
array(
'id' => $key,
'username' => 'user#'.$key,
'nb_lines' => $value,
)
);
}
}
$id_of = array();
foreach ($user_ids as $key => $value)
//Multidimentionnal sorting
usort($filterable_users, function ($a, $b)
{
if (isset($username_of[$key]))
{
$id_of[$username_of[$key]] = $key;
}
else
{
$id_of['user#'.$key] = $key;
}
}
return strtolower($a['username']) <=> strtolower($b['username']);
});
// return $output_lines;
return array(
'result_lines' => $output_lines,
'filterable_users' => $filterable_users,
'id_of' => $id_of,
);
}