langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make sure sort field updated when field deleted (#737)

Browse Source
This commit is contained in:
Damien Elmes 2013-04-11 14:23:06 +09:00
parent f3f7835032
commit 7957dff33f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
anki/models.py
View File

@ -250,17 +250,23 @@ and notes.mid = ? and cards.ord = ?""", m['id'], ord)
def remField(self, m, field): def remField(self, m, field):
self.col.modSchema() self.col.modSchema()
# save old sort field
sortFldName = m['flds'][m['sortf']]['name']
idx = m['flds'].index(field) idx = m['flds'].index(field)
m['flds'].remove(field) m['flds'].remove(field)
if m['sortf'] >= len(m['flds']): # restore old sort field if possible, or revert to first field
m['sortf'] -= 1 m['sortf'] = 0
for c, f in enumerate(m['flds']):
if f['name'] == sortFldName:
m['sortf'] = c
break
self._updateFieldOrds(m) self._updateFieldOrds(m)
def delete(fields): def delete(fields):
del fields[idx] del fields[idx]
return fields return fields
self._transformFields(m, delete) self._transformFields(m, delete)
if idx == self.sortIdx(m): if m['flds'][m['sortf']]['name'] != sortFldName:
# need to rebuild # need to rebuild sort field
self.col.updateFieldCache(self.nids(m)) self.col.updateFieldCache(self.nids(m))
# saves # saves
self.renameField(m, field, None) self.renameField(m, field, None)