GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 16:56:36 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Fix/Reschedule doesn't work on cards in filtered deck (#3441)

Browse source 
* Fix/Reschedule doesn't work on cards in filtered deck

* Update docstring (dae)
This commit is contained in:
Jarrett Ye 2024-10-02 16:09:25 +08:00 committed by GitHub
parent d6aa95950d
commit 159681d9f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rslib/src/search/parser.rs
View file

@ -61,10 +61,11 @@ pub enum SearchNode {
EditedInDays(u32), EditedInDays(u32),
CardTemplate(TemplateKind), CardTemplate(TemplateKind),
Deck(String), Deck(String),
/// Matches cards in a list of decks (original_deck_id is not checked). /// Matches cards in a list of deck ids. Cards are matched even if they are
/// in a filtered deck.
DeckIdsWithoutChildren(String), DeckIdsWithoutChildren(String),
/// Matches cards in a deck or its children (original_deck_id is not /// Matches cards in a deck or its children (original_deck_id is not
/// checked). /// checked, so filtered cards are not matched).
DeckIdWithChildren(DeckId), DeckIdWithChildren(DeckId),
IntroducedInDays(u32), IntroducedInDays(u32),
NotetypeId(NotetypeId), NotetypeId(NotetypeId),

7
rslib/src/search/sqlwriter.rs
View file

@ -161,7 +161,12 @@ impl SqlWriter<'_> {
write!(self.sql, "n.mid = {}", ntid).unwrap(); write!(self.sql, "n.mid = {}", ntid).unwrap();
} }
SearchNode::DeckIdsWithoutChildren(dids) => { SearchNode::DeckIdsWithoutChildren(dids) => {
write!(self.sql, "c.did in ({})", dids).unwrap(); write!(
self.sql,
"c.did in ({}) or (c.odid != 0 and c.odid in ({}))",
dids, dids
)
.unwrap();
} }
SearchNode::DeckIdWithChildren(did) => self.write_deck_id_with_children(*did)?, SearchNode::DeckIdWithChildren(did) => self.write_deck_id_with_children(*did)?,
SearchNode::Notetype(notetype) => self.write_notetype(&norm(notetype)), SearchNode::Notetype(notetype) => self.write_notetype(&norm(notetype)),