Skip to content
Snippets Groups Projects
Verified Commit 51f25247 authored by Andrej Ramašeuski's avatar Andrej Ramašeuski
Browse files

Inteligentnejsi razeni uzivatelu

parent 35b63fbf
No related branches found
No related tags found
No related merge requests found
Pipeline #2774 passed
...@@ -2,7 +2,7 @@ image: docker:19.03.12 ...@@ -2,7 +2,7 @@ image: docker:19.03.12
variables: variables:
DOCKER_TLS_CERTDIR: "/certs" DOCKER_TLS_CERTDIR: "/certs"
IMAGE_VER: 1.10.1 IMAGE_VER: 1.10.2
services: services:
- docker:19.03.12-dind - docker:19.03.12-dind
......
...@@ -91,12 +91,19 @@ sub _users ($c, $search) { ...@@ -91,12 +91,19 @@ sub _users ($c, $search) {
$user->{priority} = 1 if $user->{lastname} =~ /^$search/i; $user->{priority} = 1 if $user->{lastname} =~ /^$search/i;
$user->{priority} = 2 if $user->{username} =~ /^$search/i; $user->{priority} = 2 if $user->{username} =~ /^$search/i;
$user->{priority} = 3 if $user->{firstname} =~ /^$search/i; $user->{priority} = 3 if $user->{firstname} =~ /^$search/i;
$user->{priority} +=10 if scalar @{ $user->{groups} };
GROUP:
foreach my $group ( @{ $user->{groups}} ) {
$user->{priority} +=100 if $group =~ /^cen:(f|regp)/; #TODO: do cfg
}
push @tmp, $user, push @tmp, $user,
} }
USER: USER:
foreach my $user ( sort { foreach my $user ( sort {
$b->{included} <=> $a->{included} or
$b->{priority} <=> $a->{priority} or $b->{priority} <=> $a->{priority} or
lc($a->{firstname}) cmp lc($b->{firstname}) or lc($a->{firstname}) cmp lc($b->{firstname}) or
lc($a->{lastname}) cmp lc($b->{lastname}) lc($a->{lastname}) cmp lc($b->{lastname})
......
openapi: 3.0.3 openapi: 3.0.3
info: info:
version: 1.8.0 version: 1.10.2
title: CF Online title: CF Online
description: CF Online description: CF Online
license: license:
...@@ -13,10 +13,10 @@ info: ...@@ -13,10 +13,10 @@ info:
url: https://pardubicky.pirati.cz/lide/andrej-ramaseuski/ url: https://pardubicky.pirati.cz/lide/andrej-ramaseuski/
servers: servers:
- url: http://127.0.0.1:3000/api
description: Developement server
- url: https://cf2021.pirati.cz/api - url: https://cf2021.pirati.cz/api
description: Production server description: Production server
- url: http://127.0.0.1:3000/api
description: Developement server
components: components:
securitySchemes: securitySchemes:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment