diff options
| author | metamuffin <metamuffin@disroot.org> | 2023-10-04 23:07:06 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2023-10-04 23:07:06 +0200 |
| commit | ae6885187b0aa881164151ab97bd4887c83b775a (patch) | |
| tree | f74b2465fd2230623b80bd7946d2d723ea807b22 /server | |
| parent | 994ed8a43486755d34147b9282cb786f46c63ae8 (diff) | |
| download | jellything-ae6885187b0aa881164151ab97bd4887c83b775a.tar jellything-ae6885187b0aa881164151ab97bd4887c83b775a.tar.bz2 jellything-ae6885187b0aa881164151ab97bd4887c83b775a.tar.zst | |
fix import path of folders
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/import.rs | 1 | ||||
| -rw-r--r-- | server/src/routes/ui/admin/log.rs | 5 | ||||
| -rw-r--r-- | server/src/routes/ui/admin/user.rs | 5 |
3 files changed, 11 insertions, 0 deletions
diff --git a/server/src/import.rs b/server/src/import.rs index ad1d5e9..4019958 100644 --- a/server/src/import.rs +++ b/server/src/import.rs @@ -73,6 +73,7 @@ pub async fn import_path( .into_iter() .map(|p| import_path(p.clone(), db, fed, node_path.clone()).map_err(|e| (p, e))) .collect(); + node_path.pop(); // we will set the dirs path later and need it to not be included let mut children_ids = Vec::new(); let mut errs = 0; diff --git a/server/src/routes/ui/admin/log.rs b/server/src/routes/ui/admin/log.rs index fb09091..de91acd 100644 --- a/server/src/routes/ui/admin/log.rs +++ b/server/src/routes/ui/admin/log.rs @@ -1,3 +1,8 @@ +/* + This file is part of jellything (https://codeberg.org/metamuffin/jellything) + which is licensed under the GNU Affero General Public License (version 3); see /COPYING. + Copyright (C) 2023 metamuffin <metamuffin.org> +*/ use crate::{ routes::ui::{ account::session::AdminSession, diff --git a/server/src/routes/ui/admin/user.rs b/server/src/routes/ui/admin/user.rs index 42bcfa7..f991e99 100644 --- a/server/src/routes/ui/admin/user.rs +++ b/server/src/routes/ui/admin/user.rs @@ -1,3 +1,8 @@ +/* + This file is part of jellything (https://codeberg.org/metamuffin/jellything) + which is licensed under the GNU Affero General Public License (version 3); see /COPYING. + Copyright (C) 2023 metamuffin <metamuffin.org> +*/ use crate::{ database::Database, routes::ui::{ |