Browse Source

Add back subsections in basic section ser

Closes #733
index-subcmd
Vincent Prouillet 5 years ago
parent
commit
e231818718
2 changed files with 13 additions and 15 deletions
  1. +12
    -14
      components/library/src/content/ser.rs
  2. +1
    -1
      components/library/src/taxonomies/mod.rs

+ 12
- 14
components/library/src/content/ser.rs View File

@@ -254,23 +254,21 @@ impl<'a> SerializingSection<'a> {
} }
} }


/// Same as from_section but doesn't fetch pages and sections
/// Same as from_section but doesn't fetch pages
pub fn from_section_basic(section: &'a Section, library: Option<&'a Library>) -> Self { pub fn from_section_basic(section: &'a Section, library: Option<&'a Library>) -> Self {
let ancestors = if let Some(ref lib) = library {
section
let mut ancestors = vec![];
let mut translations = vec![];
let mut subsections = vec![];
if let Some(ref lib) = library {
ancestors = section
.ancestors .ancestors
.iter() .iter()
.map(|k| lib.get_section_by_key(*k).file.relative.clone()) .map(|k| lib.get_section_by_key(*k).file.relative.clone())
.collect()
} else {
vec![]
};

let translations = if let Some(ref lib) = library {
TranslatedContent::find_all_sections(section, lib)
} else {
vec![]
};
.collect();
translations = TranslatedContent::find_all_sections(section, lib);
subsections =
section.subsections.iter().map(|k| lib.get_section_path_by_key(*k)).collect();
}


SerializingSection { SerializingSection {
relative_path: &section.file.relative, relative_path: &section.file.relative,
@@ -287,7 +285,7 @@ impl<'a> SerializingSection<'a> {
assets: &section.serialized_assets, assets: &section.serialized_assets,
lang: &section.lang, lang: &section.lang,
pages: vec![], pages: vec![],
subsections: vec![],
subsections,
translations, translations,
} }
} }


+ 1
- 1
components/library/src/taxonomies/mod.rs View File

@@ -421,7 +421,7 @@ mod tests {
if x.kind.lang == "en" { if x.kind.lang == "en" {
t = Some(x) t = Some(x)
} }
},
}
"categories" => c = Some(x), "categories" => c = Some(x),
"auteurs" => a = Some(x), "auteurs" => a = Some(x),
_ => unreachable!(), _ => unreachable!(),


Loading…
Cancel
Save