Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-06-03 13:32:56 +03:00
parent b4e87cfd47
commit 00626152c2
8 changed files with 404 additions and 54 deletions

View File

@@ -79,11 +79,11 @@ func ListActivityLogs(
q.Page = 1
}
// limit <=0 → unlimited
if q.Limit < 0 {
q.Limit = 50
if q.Limit <= 0 {
q.Limit = 1000
}
if q.Limit > 200 {
q.Limit = 200
if q.Limit > 1000 {
q.Limit = 1000
}
offset := 0
@@ -200,17 +200,13 @@ LEFT JOIN dfrole r ON r.id = ru.dfrole_id
%s
ORDER BY l.created_at DESC
`, whereSQL)
// LIMIT sadece istenirse
if q.Limit > 0 {
listSQL += fmt.Sprintf(
" LIMIT $%d OFFSET $%d",
len(listArgs)+1,
len(listArgs)+2,
)
listSQL += fmt.Sprintf(
" LIMIT $%d OFFSET $%d",
len(listArgs)+1,
len(listArgs)+2,
)
listArgs = append(listArgs, q.Limit, offset)
}
listArgs = append(listArgs, q.Limit, offset)
rows, err := db.QueryContext(ctx, listSQL, listArgs...)
if err != nil {