Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix '_hasattributebase.py' (#820)

Browse Source 
Check all values of an attribute type and not only the first one.

Check all values of an attribute type. If a person has several attributes with the same type/key the current behaviour is that only the first value is checked.

Example Person X Atrributes:

    (Key=occupation: Value=farmer)
    (Key=occupation: Value=soldier)
    (Key=occupation: Value=smith)

=> Currently: Filter 'persons with attribut' (Key=occupation, Value=farmer) returns Person X, but no return of Perrson X for (Key=occupation, Value=soldier) or (Key=occupation: Value=smith).

=> After fix: Person X is returned for all three filter searches.
This commit is contained in:
Mattkmmr 2019-06-10 03:47:37 +02:00 committed by Sam Manzi
parent f123cac308
commit 73705b08cd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gramps/gen/filters/rules/_hasattributebase.py
View File

@ -2,6 +2,7 @@
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2002-2006 Donald N. Allingham # Copyright (C) 2002-2006 Donald N. Allingham
# Copyright (C) 2019 Matthias Kemmer
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -34,6 +35,7 @@ _ = glocale.translation.gettext
from ...lib.attrtype import AttributeType from ...lib.attrtype import AttributeType
from . import Rule from . import Rule
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# HasAttribute # HasAttribute
@ -44,10 +46,10 @@ class HasAttributeBase(Rule):
Rule that checks for an object with a particular attribute. Rule that checks for an object with a particular attribute.
""" """
labels = [ 'Attribute:', 'Value:' ] labels = ['Attribute:', 'Value:']
name = 'Objects with the <attribute>' name = 'Objects with the <attribute>'
description = "Matches objects with the given attribute " \ description = "Matches objects with the given attribute " \
"of a particular value" "of a particular value"
category = _('General filters') category = _('General filters')
allow_regex = True allow_regex = True
@ -60,5 +62,6 @@ class HasAttributeBase(Rule):
name_match = attr.get_type() == specified_type name_match = attr.get_type() == specified_type
if name_match: if name_match:
return self.match_substring(1, attr.get_value()) if self.match_substring(1, attr.get_value()):
return True
return False return False