src/model/user/basic.rs

@@ -499,7 +499,7 @@ impl User {
             )
         })?;
 
-        if !role.hide_in_lists {
+        if !role.hide_in_lists && role.cluster.is_none() {
             ActivityBuilder::new(&format!(
                 "{updated_by} hat die Rolle '{role}' dem Benutzer {self} hinzugefügt."
             ))

src/model/user/mod.rs

@@ -1,21 +1,20 @@
 use std::{fmt::Display, ops::DerefMut};
 
-use argon2::{Argon2, PasswordHasher, password_hash::SaltString};
+use argon2::{password_hash::SaltString, Argon2, PasswordHasher};
 use chrono::{Datelike, Local, NaiveDate};
 use log::info;
 use rocket::async_trait;
 use rocket::{
-    Request,
     http::{Cookie, Status},
     request::{FromRequest, Outcome},
     time::{Duration, OffsetDateTime},
+    Request,
 };
 use serde::{Deserialize, Serialize};
 use sqlx::{FromRow, Sqlite, SqlitePool, Transaction};
 
 use super::activity::ActivityBuilder;
 use super::{
-    Day,
     log::Log,
     logbook::Logbook,
     mail::Mail,
@@ -24,6 +23,7 @@ use super::{
     role::Role,
     stat::Stat,
     tripdetails::TripDetails,
+    Day,
 };
 use crate::AMOUNT_DAYS_TO_SHOW_TRIPS_AHEAD;
 use scheckbuch::ScheckbuchUser;
@@ -982,21 +982,17 @@ mod test {
     #[sqlx::test]
     fn wrong_pw() {
         let pool = testdb!();
-        assert!(
-            User::login(&pool, "admin".into(), "admi".into())
+        assert!(User::login(&pool, "admin".into(), "admi".into())
             .await
-                .is_err()
-        );
+            .is_err());
     }
 
     #[sqlx::test]
     fn wrong_username() {
         let pool = testdb!();
-        assert!(
-            User::login(&pool, "admi".into(), "admin".into())
+        assert!(User::login(&pool, "admi".into(), "admin".into())
             .await
-                .is_err()
-        );
+            .is_err());
     }
 
     #[sqlx::test]
@@ -1015,11 +1011,9 @@ mod test {
         let pool = testdb!();
         let user = User::find_by_id(&pool, 1).await.unwrap();
 
-        assert!(
-            User::login(&pool, "admin".into(), "abc".into())
+        assert!(User::login(&pool, "admin".into(), "abc".into())
             .await
-                .is_err()
-        );
+            .is_err());
 
         user.update_pw(&pool, "abc".into()).await;