GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-12-13 14:50:59 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

update current note type in backend

Browse source
This commit is contained in:
Damien Elmes 2020-05-17 20:01:16 +10:00
parent 3cb870ec9c
commit 803aeff16e
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pylib/anki/models.py
View file

@ -205,15 +205,10 @@ class ModelManager:
self.col.backend.remove_notetype(nt.id) self.col.backend.remove_notetype(nt.id)
def remove(self, id: int) -> None: def remove(self, id: int) -> None:
self.col.modSchema(check=True) "Modifies schema."
self._remove_from_cache(id) self._remove_from_cache(id)
was_current = self.current()["id"] == id
self.col.backend.remove_notetype(id) self.col.backend.remove_notetype(id)
# fixme: handle in backend
if was_current:
self.col.conf["curModel"] = self.all_names_and_ids()[0].id
def add(self, m: NoteType) -> None: def add(self, m: NoteType) -> None:
self.save(m) self.save(m)

1
rslib/src/config.rs
View file

@ -173,7 +173,6 @@ impl Collection {
self.get_config_optional(ConfigKey::CurrentNoteTypeID) self.get_config_optional(ConfigKey::CurrentNoteTypeID)
} }
#[allow(dead_code)]
pub(crate) fn set_current_notetype_id(&self, id: NoteTypeID) -> Result<()> { pub(crate) fn set_current_notetype_id(&self, id: NoteTypeID) -> Result<()> {
self.set_config(ConfigKey::CurrentNoteTypeID, &id) self.set_config(ConfigKey::CurrentNoteTypeID, &id)
} }

10
rslib/src/notetype/mod.rs
View file

@ -446,7 +446,15 @@ impl Collection {
self.transact(None, |col| { self.transact(None, |col| {
col.storage.set_schema_modified()?; col.storage.set_schema_modified()?;
col.state.notetype_cache.remove(&ntid); col.state.notetype_cache.remove(&ntid);
col.storage.remove_notetype(ntid) col.storage.remove_notetype(ntid)?;
let all = col.storage.get_all_notetype_names()?;
if all.is_empty() {
let mut nt = all_stock_notetypes(&col.i18n).remove(0);
col.add_notetype_inner(&mut nt, col.usn()?)?;
col.set_current_notetype_id(nt.id)
} else {
col.set_current_notetype_id(all[0].0)
}
}) })
} }
} }