Bug 31595: Don't process extended attributes if none are inlcuded in the file
This patch simply adds a check to the import process to only process attrbutes if they have been found in the data To test: 1 - Import some patrons without extended attributes 2 - Import patrons including extended attributes 3 - Confirm both work unchanged Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
parent
0d974073db
commit
40cff1a774
1 changed files with 2 additions and 2 deletions
|
@ -331,7 +331,7 @@ sub import_patrons {
|
|||
}
|
||||
}
|
||||
}
|
||||
if ($extended) {
|
||||
if ($extended && @$patron_attributes) {
|
||||
if ($ext_preserve) {
|
||||
$patron_attributes = $patron->extended_attributes->merge_and_replace_with( $patron_attributes );
|
||||
}
|
||||
|
@ -391,7 +391,7 @@ sub import_patrons {
|
|||
);
|
||||
}
|
||||
|
||||
if ($extended) {
|
||||
if ($extended && @$patron_attributes) {
|
||||
# FIXME Hum, we did not filter earlier and now we do?
|
||||
$patron->extended_attributes->filter_by_branch_limitations->delete;
|
||||
$patron->extended_attributes($patron_attributes);
|
||||
|
|
Loading…
Reference in a new issue