2006-12-11 Don Allingham <don@gramps-project.org>

* src/GrampsDb/_WriteXML.py: handle XML escapes
	* src/DisplayModels/_BaseModel.py: handle ignored values in filtering



svn: r7782
This commit is contained in:
Don Allingham
2006-12-11 21:09:25 +00:00
parent 60b3ec43a0
commit 1867264228
3 changed files with 29 additions and 17 deletions

View File

@ -114,9 +114,11 @@ class BaseModel(gtk.GenericTreeModel):
if self.db.is_open():
if self.search:
self.datalist = [h for h in self.sort_keys()\
if self.search.match(h) and h not in self.skip and h != ignore]
if self.search.match(h) and \
h not in self.skip and h != ignore]
else:
self.datalist = [h for h in self.sort_keys() if h not in self.skip and h != ignore]
self.datalist = [h for h in self.sort_keys() \
if h not in self.skip and h != ignore]
i = 0
self.indexlist = {}
for key in self.datalist:
@ -130,9 +132,12 @@ class BaseModel(gtk.GenericTreeModel):
def _rebuild_filter(self, ignore=None):
if self.db.is_open():
if self.search:
self.datalist = self.search.apply(self.db, [ k for k in self.sort_keys() if k != ignore])
self.datalist = self.search.apply(self.db,
[ k for k in self.sort_keys()\
if k != ignore])
else:
self.datalist = self.sort_keys()
self.datalist = [ k for k in self.sort_keys() \
if k != ignore ]
i = 0
self.indexlist = {}