language-improvement #1041
@ -87,7 +87,7 @@ impl From<ReasonAuth<'_>> for ActivityBuilder {
|
|||||||
.keep_until_days(7)
|
.keep_until_days(7)
|
||||||
}
|
}
|
||||||
ReasonAuth::DeletedUserLogin(user) => Self::new(&format!(
|
ReasonAuth::DeletedUserLogin(user) => Self::new(&format!(
|
||||||
"User {user} wollte sich einloggen, klappte jedoch nicht weil er gelöscht wurde."
|
"{user} wollte sich einloggen, klappte jedoch nicht weil der Account gelöscht wurde."
|
||||||
))
|
))
|
||||||
.relevant_for_user(user)
|
.relevant_for_user(user)
|
||||||
.keep_until_days(30),
|
.keep_until_days(30),
|
||||||
|
@ -2,8 +2,8 @@ use std::io::Write;
|
|||||||
|
|
||||||
use chrono::{Duration, NaiveDate, NaiveTime};
|
use chrono::{Duration, NaiveDate, NaiveTime};
|
||||||
use ics::{
|
use ics::{
|
||||||
properties::{DtEnd, DtStart, Summary},
|
|
||||||
ICalendar,
|
ICalendar,
|
||||||
|
properties::{DtEnd, DtStart, Summary},
|
||||||
};
|
};
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
use sqlx::{FromRow, Row, SqlitePool};
|
use sqlx::{FromRow, Row, SqlitePool};
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
|
|
||||||
use ics::{components::Property, ICalendar};
|
use ics::{ICalendar, components::Property};
|
||||||
use sqlx::SqlitePool;
|
use sqlx::SqlitePool;
|
||||||
|
|
||||||
use crate::model::{event::Event, trip::Trip, user::User};
|
use crate::model::{event::Event, trip::Trip, user::User};
|
||||||
|
@ -583,9 +583,11 @@ mod test {
|
|||||||
|
|
||||||
let last_notification = &Notification::for_user(&pool, &cox).await[0];
|
let last_notification = &Notification::for_user(&pool, &cox).await[0];
|
||||||
|
|
||||||
assert!(last_notification
|
assert!(
|
||||||
.message
|
last_notification
|
||||||
.starts_with("cox2 hat eine Ausfahrt zur selben Zeit"));
|
.message
|
||||||
|
.starts_with("cox2 hat eine Ausfahrt zur selben Zeit")
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[sqlx::test]
|
#[sqlx::test]
|
||||||
|
@ -475,7 +475,7 @@ ASKÖ Ruderverein Donau Linz", self.name),
|
|||||||
db,
|
db,
|
||||||
&board,
|
&board,
|
||||||
&format!(
|
&format!(
|
||||||
"User {user} wollte sich einloggen, klappte jedoch nicht weil er gelöscht wurde."
|
"{user} wollte sich einloggen, klappte jedoch nicht weil der Account gelöscht wurde."
|
||||||
),
|
),
|
||||||
"Fehlgeschlagener Login",
|
"Fehlgeschlagener Login",
|
||||||
None,
|
None,
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
use rocket::{
|
use rocket::{
|
||||||
|
FromForm, Request, Route, State,
|
||||||
form::Form,
|
form::Form,
|
||||||
get,
|
get,
|
||||||
http::{Cookie, CookieJar},
|
http::{Cookie, CookieJar},
|
||||||
@ -8,9 +9,8 @@ use rocket::{
|
|||||||
response::{Flash, Redirect},
|
response::{Flash, Redirect},
|
||||||
routes,
|
routes,
|
||||||
time::{Duration, OffsetDateTime},
|
time::{Duration, OffsetDateTime},
|
||||||
FromForm, Request, Route, State,
|
|
||||||
};
|
};
|
||||||
use rocket_dyn_templates::{context, tera, Template};
|
use rocket_dyn_templates::{Template, context, tera};
|
||||||
use sqlx::SqlitePool;
|
use sqlx::SqlitePool;
|
||||||
|
|
||||||
use crate::model::{
|
use crate::model::{
|
||||||
|
@ -418,6 +418,9 @@
|
|||||||
<li class="py-1">
|
<li class="py-1">
|
||||||
<a href="/admin/boat" class="block w-100 py-2 hover:text-primary-600">Boote</a>
|
<a href="/admin/boat" class="block w-100 py-2 hover:text-primary-600">Boote</a>
|
||||||
</li>
|
</li>
|
||||||
|
<li class="py-1">
|
||||||
|
<a href="https://cloud.rudernlinz.at/login?user={{ loggedin_user.name }}" target="_blank" class="block w-100 py-2 hover:text-primary-600">Nextcloud ↗️</a>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user