Bugzilla – Attachment 32279 Details for
Bug 12929
bug 12716 introduces a regression on the patron import tools
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 12929: Restore behavior before bug 12716
PASSED-QA-Bug-12929-Restore-behavior-before-bug-12.patch (text/plain), 3.22 KB, created by
Katrin Fischer
on 2014-10-11 21:52:17 UTC
(
hide
)
Description:
[PASSED QA] Bug 12929: Restore behavior before bug 12716
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2014-10-11 21:52:17 UTC
Size:
3.22 KB
patch
obsolete
>From cf33ac033f3815d223d2d7bf497a9208535e3c15 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Tue, 16 Sep 2014 16:26:52 +0200 >Subject: [PATCH] [PASSED QA] Bug 12929: Restore behavior before bug 12716 > >This patch remove borrowernumber from the borrower list fields and >display the field list in the notes. > >Test plan: >- verify that the list of fields is displayed on the right (Notes). >- verify the borrowernumber is not displayed anymore in the field list. > >Signed-off-by: Petter Goksoyr Asen <boutrosboutrosboutros@gmail.com> > >Confirmed that this patch removes borrowernumber from list of default >values, and reintroduces missing list of CSV columns in the Notes field. > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt | 2 +- > tools/import_borrowers.pl | 5 +++-- > 2 files changed, 4 insertions(+), 3 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt >index a0727b8..d3bcf5c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt >@@ -195,7 +195,7 @@ > <li>The first line in the file must be a header row defining which columns you are supplying in the import file.</li> > <li><b>Download a starter CSV file with all the columns <a href="?sample=1">here</a>.</b> Values are comma-separated.</li> > <li>OR choose which fields you want to supply from the following list:<ul><li> >- [% FOREACH columnkey IN columnkeys %]'[% columnkey.key %]', [% END %] >+ [% FOREACH columnkey IN borrower_fields %]'[% columnkey.field %]', [% END %] > </li></ul></li> > [% IF ( ExtendedPatronAttributes ) %] > <li>If loading patron attributes, the 'patron_attributes' field should contain a comma-separated list of attribute types and values. The attribute type code and a colon should precede each value. For example: <b>INSTID:12345,LANG:fr</b> or <b>STARTDATE:January 1 2010,TRACK:Day</b>. If an input record has more than one attribute, the fields should either be entered as an unquoted string (previous examples), or with each field wrapped in separate double quotes and delimited by a comma: <b>"STARTDATE:January 1, 2010","TRACK:Day"</b>. The second syntax would be required if the data might have a comma in it, like a date string. >diff --git a/tools/import_borrowers.pl b/tools/import_borrowers.pl >index 66d1485..4bd89aa 100755 >--- a/tools/import_borrowers.pl >+++ b/tools/import_borrowers.pl >@@ -85,8 +85,9 @@ $template->param( branches => $branches ) if ( $branches ); > # get the patron categories and pass them to the template > my $categories = GetBorrowercategoryList(); > $template->param( categories => $categories ) if ( $categories ); >-my $columns = C4::Templates::GetColumnDefs( $input ); >-$template->param( borrower_fields => $columns->{borrowers} ); >+my $columns = C4::Templates::GetColumnDefs( $input )->{borrowers}; >+$columns = [ grep { $_->{field} ne 'borrowernumber' ? $_ : () } @$columns ]; >+$template->param( borrower_fields => $columns ); > > if ($input->param('sample')) { > print $input->header( >-- >1.9.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12929
:
31637
|
31969
|
32129
|
32143
| 32279 |
32280
|
32335