From 35b63fbf00a3456d3d45412c319bfdad5ab4b9b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Rama=C5=A1euski?= <andrej@x2.cz>
Date: Fri, 19 Mar 2021 13:31:37 +0100
Subject: [PATCH] Sorting dle zarazeni do skupin
---
.gitlab-ci.yml | 2 +-
lib/CF/Controller/SSO.pm | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30c510f..a6685c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ image: docker:19.03.12
variables:
DOCKER_TLS_CERTDIR: "/certs"
- IMAGE_VER: 1.10.0
+ IMAGE_VER: 1.10.1
services:
- docker:19.03.12-dind
diff --git a/lib/CF/Controller/SSO.pm b/lib/CF/Controller/SSO.pm
index f93a120..7aae982 100644
--- a/lib/CF/Controller/SSO.pm
+++ b/lib/CF/Controller/SSO.pm
@@ -96,7 +96,8 @@ sub _users ($c, $search) {
USER:
foreach my $user ( sort {
- $b->{priority} <=> $a->{priority} or
+ $b->{included} <=> $a->{included} or
+ $b->{priority} <=> $a->{priority} or
lc($a->{firstname}) cmp lc($b->{firstname}) or
lc($a->{lastname}) cmp lc($b->{lastname})
} @tmp ) {
--
GitLab