From d3ed104536c6e95475dc6714feeb3d4e54f17874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= Date: Sat, 11 Mar 2017 17:18:10 +0100 Subject: [PATCH] Bug 8603: Patron card creator - 'Barcode Type' doesn't stick in layouts To reproduce: 1. Make a new layout 2. Tick "Print card number as barcode" 3. Change 'Barcode Type' to anything other than Code39 4. Save 5. Edit it again 6. Its back to Code39 To test: 1. Apply patch 2. Repeat steps above 3. Verify that 'Barcode type' is selected as expected --- patroncards/edit-layout.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patroncards/edit-layout.pl b/patroncards/edit-layout.pl index 5d5d2df..81df878 100755 --- a/patroncards/edit-layout.pl +++ b/patroncards/edit-layout.pl @@ -140,7 +140,7 @@ if ($op eq 'edit') { # Handle barcodes... my @barcode = (); foreach my $barcode_param (keys %{$layout_xml->{'barcode'}->[0]}) { - push @barcode, (($barcode_param eq 'type' ? ("barcode_" . $barcode_param => _set_selected($layout_xml->{'barcode'}->[0]->{'barcode_type'}, $barcode_types)) : ("barcode_" . $barcode_param => $layout_xml->{'barcode'}->[0]->{$barcode_param}))); + push @barcode, (($barcode_param eq 'type' ? ("barcode_" . $barcode_param => _set_selected($layout_xml->{'barcode'}->[0]->{'type'}, $barcode_types)) : ("barcode_" . $barcode_param => $layout_xml->{'barcode'}->[0]->{$barcode_param}))); } foreach my $unit (@$units){ @@ -156,7 +156,7 @@ if ($op eq 'edit') { guide_box => $layout_xml->{'guide_box'}, units => $units, @barcode, - barcode_type => get_barcode_types(), + barcode_type => _set_selected($layout_xml->{'barcode'}->[0]->{'type'}, $barcode_types), @text_fields, @images, guidebox => 0, -- 2.1.4