matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Make sure category is linked when setting it

Browse source
This commit is contained in:
Matthias Beyer 2018-04-26 11:20:09 +02:00
parent 0bacfb0a88
commit f321aa82a1
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/entry/libimagentrycategory/src/category.rs
View file

@ -72,12 +72,15 @@ impl EntryCategory for Entry {
/// ///
/// This function should be used by default over EntryCategory::set_category()! /// This function should be used by default over EntryCategory::set_category()!
fn set_category_checked(&mut self, register: &CategoryRegister, s: Category) -> Result<()> { fn set_category_checked(&mut self, register: &CategoryRegister, s: Category) -> Result<()> {
register.category_exists(&s.0) let c_str = s.clone().into();
.and_then(|bl| if bl { let mut category = register
self.set_category(s) .get_category_by_name(&c_str)?
} else { .ok_or_else(|| CE::from_kind(CEK::CategoryDoesNotExist))?;
Err(CE::from_kind(CEK::CategoryDoesNotExist))
}) let _ = self.set_category(s)?;
let _ = self.add_internal_link(&mut category)?;
Ok(())
} }
fn get_category(&self) -> Result<Option<Category>> { fn get_category(&self) -> Result<Option<Category>> {