Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions OngekiScoreLog/app/UserStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,17 @@ function getRecentUserData($id, $exclude_private = true)
->from($this->table)->where('user_id', $id)->orderBy('id', 'desc')->limit(1);

$me = \Auth::user();
# プライベートユーザを除外(自分自身以外) 管理者権限がある場合は除外しない
if ($exclude_private && ($me === null || $me->role !== 7)) {
if ($me === null || $id != $me->id) {
$sql = $sql
->join('users', "$this->table.user_id", '=', 'users.id')
->where('users.private', 0);
}

// 管理者には見せる
if ($me !== null && $me->role === 7) {
$exclude_private = false;
}

# プライベートユーザを除外(自分自身以外)
if ($exclude_private && ($me === null || $id != $me->id)) {
$sql = $sql
->join('users', "$this->table.user_id", '=', 'users.id')
->where('users.private', 0);
}

return $sql->select("$this->table.*")->get();
Expand Down Expand Up @@ -50,9 +54,9 @@ function getRecentAllUserData($exclude_private = true)
->join('users', 't1.user_id', '=', 'users.id')
->where('users.private', 0);

$sql = $sql_all_users->select('t1.*')->get();
$sql = $sql_all_users->select('t1.*')->orderBy('t1.created_at', 'desc')->get();
} else {
$sql = DB::select('SELECT * FROM user_status AS t1 WHERE created_at = (SELECT MAX(created_at) FROM user_status AS t2 WHERE t1.user_id = t2.user_id)');
$sql = DB::select('SELECT * FROM user_status AS t1 WHERE created_at = (SELECT MAX(created_at) FROM user_status AS t2 WHERE t1.user_id = t2.user_id) ORDER BY t1.created_at DESC');
}

$users = [];
Expand Down
2 changes: 1 addition & 1 deletion OngekiScoreLog/resources/assets/js/sortAllUserTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ var options = {
valueNames: ['sort_id', 'sort_name', 'sort_trophy', 'sort_lv', 'sort_rating', 'sort_max', 'sort_bp', 'sort_update']
};
var sortTable = new List('sort_table', options);
sortTable.sort('sort_update', {order: "desc"});
// sortTable.sort('sort_update', {order: "desc"});