Merge branch 'staging' into 'main'
deploy :O See merge request PhilippHofer/rot!48
This commit is contained in:
commit
e72679b812
@ -75,7 +75,6 @@ async fn create<'r>(
|
|||||||
data: Form<FormBoatDamageToAdd<'r>>,
|
data: Form<FormBoatDamageToAdd<'r>>,
|
||||||
user: NonGuestUser,
|
user: NonGuestUser,
|
||||||
) -> Flash<Redirect> {
|
) -> Flash<Redirect> {
|
||||||
return Flash::error(Redirect::to("/log"), "Du musst noch kurz geduldig sein. Sobald wir unser Logbuch umgestellt haben, kannst du es hier im Ruderassistenten verwenden ;)");
|
|
||||||
let boatdamage_to_add = BoatDamageToAdd {
|
let boatdamage_to_add = BoatDamageToAdd {
|
||||||
boat_id: data.boat_id,
|
boat_id: data.boat_id,
|
||||||
desc: data.desc,
|
desc: data.desc,
|
||||||
@ -105,7 +104,6 @@ async fn create_from_kiosk<'r>(
|
|||||||
data: Form<FormBoatDamageToAddKiosk<'r>>,
|
data: Form<FormBoatDamageToAddKiosk<'r>>,
|
||||||
_kiosk: KioskCookie,
|
_kiosk: KioskCookie,
|
||||||
) -> Flash<Redirect> {
|
) -> Flash<Redirect> {
|
||||||
return Flash::error(Redirect::to("/log"), "Du musst noch kurz geduldig sein. Sobald wir unser Logbuch umgestellt haben, kannst du es hier im Ruderassistenten verwenden ;)");
|
|
||||||
let boatdamage_to_add = BoatDamageToAdd {
|
let boatdamage_to_add = BoatDamageToAdd {
|
||||||
boat_id: data.boat_id,
|
boat_id: data.boat_id,
|
||||||
desc: data.desc,
|
desc: data.desc,
|
||||||
@ -133,7 +131,6 @@ async fn fixed<'r>(
|
|||||||
boatdamage_id: i32,
|
boatdamage_id: i32,
|
||||||
coxuser: CoxUser,
|
coxuser: CoxUser,
|
||||||
) -> Flash<Redirect> {
|
) -> Flash<Redirect> {
|
||||||
return Flash::error(Redirect::to("/log"), "Du musst noch kurz geduldig sein. Sobald wir unser Logbuch umgestellt haben, kannst du es hier im Ruderassistenten verwenden ;)");
|
|
||||||
let boatdamage = BoatDamage::find_by_id(db, boatdamage_id).await.unwrap(); //TODO: Fix
|
let boatdamage = BoatDamage::find_by_id(db, boatdamage_id).await.unwrap(); //TODO: Fix
|
||||||
let boatdamage_fixed = BoatDamageFixed {
|
let boatdamage_fixed = BoatDamageFixed {
|
||||||
desc: data.desc,
|
desc: data.desc,
|
||||||
@ -157,7 +154,6 @@ async fn verified<'r>(
|
|||||||
boatdamage_id: i32,
|
boatdamage_id: i32,
|
||||||
techuser: TechUser,
|
techuser: TechUser,
|
||||||
) -> Flash<Redirect> {
|
) -> Flash<Redirect> {
|
||||||
return Flash::error(Redirect::to("/log"), "Du musst noch kurz geduldig sein. Sobald wir unser Logbuch umgestellt haben, kannst du es hier im Ruderassistenten verwenden ;)");
|
|
||||||
let boatdamage = BoatDamage::find_by_id(db, boatdamage_id).await.unwrap(); //TODO: Fix
|
let boatdamage = BoatDamage::find_by_id(db, boatdamage_id).await.unwrap(); //TODO: Fix
|
||||||
let boatdamage_verified = BoatDamageVerified {
|
let boatdamage_verified = BoatDamageVerified {
|
||||||
desc: data.desc,
|
desc: data.desc,
|
||||||
|
1203
src/tera/log.rs
1203
src/tera/log.rs
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user