gburri/recipes
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Current recipe id was not set

Browse source
This commit is contained in:
Greg Burri 2025-04-21 19:37:09 +02:00
parent 812ba9dc3b
commit 9dccd553bc
5 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
backend/src/html_templates.rs
View file

@ -8,9 +8,9 @@ use crate::{
};
pub struct Recipes {
pub public: Vec<(i64, String)>,
pub private: Vec<(i64, String)>,
pub current_id: Option<i64>,
public: Vec<(i64, String)>,
private: Vec<(i64, String)>,
current_id: Option<i64>,
}
impl Recipes {
@ -18,6 +18,7 @@ impl Recipes {
connection: db::Connection,
user: &Option<model::User>,
lang: &str,
current_id: Option<i64>,
) -> Result<Self, db::DBError> {
Ok(Recipes {
public: connection
@ -28,7 +29,7 @@ impl Recipes {
} else {
vec![]
},
current_id: None,
current_id,
})
}

1
backend/src/log.rs
View file

@ -6,7 +6,6 @@ use std::{
};
use itertools::Itertools;
use tracing::{Level, event};
use tracing_appender::{
non_blocking::WorkerGuard,
rolling::{RollingFileAppender, Rotation},

9
backend/src/services/fragments.rs
View file

@ -22,8 +22,13 @@ pub async fn recipes_list_fragments(
) -> Result<impl IntoResponse> {
Ok(Html(
RecipesListFragmentTemplate {
recipes: Recipes::new(connection, &context.user, context.tr.current_lang_code())
.await?,
recipes: Recipes::new(
connection,
&context.user,
context.tr.current_lang_code(),
current_recipe.current_recipe_id,
)
.await?,
context,
}
.render()?,

18
backend/src/services/mod.rs
View file

@ -53,8 +53,13 @@ pub async fn home_page(
) -> Result<impl IntoResponse> {
Ok(Html(
HomeTemplate {
recipes: Recipes::new(connection, &context.user, context.tr.current_lang_code())
.await?,
recipes: Recipes::new(
connection,
&context.user,
context.tr.current_lang_code(),
None,
)
.await?,
context,
}
.render()?,
@ -79,8 +84,13 @@ pub async fn dev_panel(
if context.user.is_some() && context.user.as_ref().unwrap().is_admin {
Ok(Html(
DevPanelTemplate {
recipes: Recipes::new(connection, &context.user, context.tr.current_lang_code())
.await?,
recipes: Recipes::new(
connection,
&context.user,
context.tr.current_lang_code(),
None,
)
.await?,
context,
log,
current_log_file: log_file.log_file.clone(),

3
backend/src/services/recipe.rs
View file

@ -4,7 +4,6 @@ use axum::{
extract::{Extension, Path, State},
response::{Html, IntoResponse, Redirect, Response},
};
// use tracing::{event, Level};
use crate::{
Context, Result,
@ -49,6 +48,7 @@ pub async fn edit(
connection,
&context.user,
context.tr.current_lang_code(),
Some(recipe_id),
)
.await?,
context,
@ -112,6 +112,7 @@ pub async fn view(
connection,
&context.user,
context.tr.current_lang_code(),
Some(recipe_id),
)
.await?,
context,