Author:
Hash:
Timestamp:
+13 -7 +/-3 browse
Kevin Schoon [me@kevinschoon.com]
f777934c0f8c312f4b3682c1b6847ee1de53dab0
Sun, 06 Jul 2025 19:47:23 +0000 (4 months ago)
| 1 | diff --git a/ayllu/src/web2/navigation.rs b/ayllu/src/web2/navigation.rs |
| 2 | index 90d56d5..1b67ddc 100644 |
| 3 | --- a/ayllu/src/web2/navigation.rs |
| 4 | +++ b/ayllu/src/web2/navigation.rs |
| 5 | @@ -74,9 +74,7 @@ pub fn subnav( |
| 6 | ), |
| 7 | ( |
| 8 | String::from("permalink"), |
| 9 | - format!( |
| 10 | - "/{collection}/{name}/{current_page}/{commit_id}/{file_path}" |
| 11 | - ), |
| 12 | + format!("/{collection}/{name}/{current_page}/{commit_id}/{file_path}"), |
| 13 | false, |
| 14 | ), |
| 15 | ( |
| 16 | diff --git a/ayllu/src/web2/routes/log.rs b/ayllu/src/web2/routes/log.rs |
| 17 | index 4882cbe..20ce81c 100644 |
| 18 | --- a/ayllu/src/web2/routes/log.rs |
| 19 | +++ b/ayllu/src/web2/routes/log.rs |
| 20 | @@ -74,9 +74,11 @@ pub async fn serve( |
| 21 | base.title = format!("Log: {}", preamble.repo_name); |
| 22 | let commits = repository.log(Selector { |
| 23 | commit: preamble.latest_commit_id.clone(), |
| 24 | - username: params.as_ref() |
| 25 | + username: params |
| 26 | + .as_ref() |
| 27 | .and_then(|params| params.get("username").cloned()), |
| 28 | - email: params.as_ref() |
| 29 | + email: params |
| 30 | + .as_ref() |
| 31 | .and_then(|params| params.get("email").cloned()), |
| 32 | limit: Some(config.items_per_page as i64), |
| 33 | })?; |
| 34 | diff --git a/ayllu/src/web2/server.rs b/ayllu/src/web2/server.rs |
| 35 | index 4bd141c..80b03f4 100644 |
| 36 | --- a/ayllu/src/web2/server.rs |
| 37 | +++ b/ayllu/src/web2/server.rs |
| 38 | @@ -120,9 +120,15 @@ pub async fn serve(cfg: &Config) -> Result<(), Box<dyn Error>> { |
| 39 | .route("/tree/{commitish}/{*file_path}", routing::get(repo::serve)) |
| 40 | .route("/log", routing::get(log_route::serve)) |
| 41 | .route("/log/{commitish}", routing::get(log_route::serve)) |
| 42 | - .route("/log/{commitish}/{*file_path}", routing::get(log_route::serve)) |
| 43 | + .route( |
| 44 | + "/log/{commitish}/{*file_path}", |
| 45 | + routing::get(log_route::serve), |
| 46 | + ) |
| 47 | .route("/blob/{commitish}/{*file_path}", routing::get(blob::serve)) |
| 48 | - .route("/raw/{commitish}/{*file_path}", routing::get(blob::serve_raw)) |
| 49 | + .route( |
| 50 | + "/raw/{commitish}/{*file_path}", |
| 51 | + routing::get(blob::serve_raw), |
| 52 | + ) |
| 53 | .route("/refs", routing::get(refs::refs)) |
| 54 | .route("/refs/tag/{tag_id}", routing::get(refs::tag)) |
| 55 | .route("/refs/archive/{ref_id}", routing::get(refs::archive)) |