Merge pull request #78 from romjerome/maintenance/gramps42

9057: fix counter for filtered entries
This commit is contained in:
Doug Blank 2015-12-14 15:27:15 -05:00 committed by Doug Blank
parent 8bf8e92e3c
commit 928a437f48

View File

@ -568,10 +568,10 @@ class TreeBaseModel(GObject.GObject, Gtk.TreeModel, BaseModel):
# The tree has both primary and secondary data. The navigation type
# (navtype) which governs the filters that are offered, is for the
# secondary data.
items = self.number_items2()
_LOG.debug("rebuild filter secondary")
self.__rebuild_filter(dfilter2, skip, items,
self.gen_cursor2, self.map2, self.add_row2)
items = self.number_items2()
_LOG.debug("rebuild filter secondary")
self.__rebuild_filter(dfilter2, skip, items,
self.gen_cursor2, self.map2, self.add_row2)
def __rebuild_filter(self, dfilter, skip, items, gen_cursor, data_map,
add_func):
@ -598,7 +598,7 @@ class TreeBaseModel(GObject.GObject, Gtk.TreeModel, BaseModel):
if not handle in skip:
if not dfilter or dfilter.match(handle, self.db):
add_func(handle, data)
self.__displayed += 1
self.__displayed += 1
status_ppl.end()
status.end()