remove more logs w/ activities
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
use crate::{
|
||||
model::{
|
||||
activity::Activity,
|
||||
activity::{Activity, ActivityWithDetails},
|
||||
family::Family,
|
||||
log::Log,
|
||||
logbook::Logbook,
|
||||
@@ -141,7 +141,11 @@ async fn view(
|
||||
|
||||
let member = Member::from(db, user.clone()).await;
|
||||
let fee = user.fee(db).await;
|
||||
let activities = Activity::for_user(db, &user).await;
|
||||
let activities: Vec<ActivityWithDetails> = Activity::for_user(db, &user)
|
||||
.await
|
||||
.into_iter()
|
||||
.map(Into::into)
|
||||
.collect();
|
||||
let financial = Role::all_cluster(db, "financial").await;
|
||||
let user_financial = user.financial(db).await;
|
||||
let skill = Role::all_cluster(db, "skill").await;
|
||||
|
@@ -14,7 +14,7 @@ use rocket_dyn_templates::{context, tera, Template};
|
||||
use sqlx::SqlitePool;
|
||||
|
||||
use crate::model::{
|
||||
activity::{self, ActivityBuilder},
|
||||
activity::{self, ActivityBuilder, ReasonAuth},
|
||||
log::Log,
|
||||
user::{LoginError, User},
|
||||
};
|
||||
@@ -83,7 +83,7 @@ async fn login(
|
||||
|
||||
cookies.add_private(Cookie::new("loggedin_user", format!("{}", user.id)));
|
||||
|
||||
ActivityBuilder::from(activity::Reason::SuccLogin(&user, agent.0))
|
||||
ActivityBuilder::from(ReasonAuth::SuccLogin(&user, agent.0))
|
||||
.save(db)
|
||||
.await;
|
||||
|
||||
|
Reference in New Issue
Block a user