[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.12-9-g485f871
Git repo owner
gitmaster at git.koha-community.org
Sun Nov 17 20:39:53 CET 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, 3.10.x has been updated
via 485f871438d6fd70cd566e26766564275ad54134 (commit)
via 9c4475ae343c31475512a28ffa834fbd5009de1f (commit)
via 8770b02fa4ca904f5ab209150242d24c3390544a (commit)
via 20e11030e5060bc7eab1734b45e3bd5e4ca0f5e9 (commit)
via e5eab778ce68e4187466b4fac0456d7e322d6ff3 (commit)
via 70924e8001f6128d6f813d59b2d7a5be17bb6b8d (commit)
via aebb1b51125eaf1924f57b830e6b52c74e2154d8 (commit)
via 5c448893ba259ba527bd9af1abfaf2c5978778b0 (commit)
via a462fef1259899878701d841d9d1b56381019782 (commit)
from 1299ff01ab1ca08c6408d43bf57995a71b948e38 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 485f871438d6fd70cd566e26766564275ad54134
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Tue Aug 13 14:55:32 2013 +0200
Bug 10718: fix items with no checkouts report
Bug 8124 has commented the option to download results items with no
checkouts report into a file. But the perl code of this page uses
the export into a file has default behavior since the input "output"
is no more present. The consequence is that there are never results
in page.
This patch removes the code concerning file output from template and perl.
Such a feature exists in guided reports.
Test plan :
Play with cgi-bin/koha/reports/catalogue_out.pl form and see if you get results
Bug 10718 - select user branch as default
In cgi-bin/koha/reports/catalogue_out.pl report, select in library filter the user logged-in.
Test plan :
- Log into intranet with a normal user
- Got to "Items with no checkouts" reports
=> Your branch is selected
- Run report
=> You see "Filtered on : Branch = <your branch>"
- Come back to report
- Select "Any library"
- Run report
=> You do not see "Filtered on : Branch"
Bug 10718 - items with no checkouts report permission is execute_reports
This report only executes SQL to change reports/catalogue_out.pl permissions from all reports subpermissions to reports/execute_reports.
Test plan :
Test you can access and run this report with only execute_reports subpermission into reports permission.
Bug 10718 - redefine limit input
In reports/catalogue_out.pl form, the limit input is by defaut none.
So by default the report queries all the catalogue.
This may take a very long time (fall into timeout) and since now the results are displayed in page, the page may be huge.
This patch modifies limit input to removes the "none" option.
Also reduces the number of options (same options as guided reports results per page).
Test plan:
- Go to reports/catalogue_out.pl
=> first value "10" is selected
- Launch report
=> You see "Filtered on: limit = 10"
Bug 10718 - perltidy on reports/catalogue_out.pl
Signed-off-by: Liz Rea <liz at catalyst.net.nz>
Tested all of these things, all ok - squashed patch for neatness.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script.
Fixed a tab in one of the comments.
Improves script, but more work needed.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit ec09fe092e302dfbaf8ddf2a26ab361be9ea915e)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 4bc27151a1cb5a50825fc739e8ccf84aef913afb)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 4bc27151a1cb5a50825fc739e8ccf84aef913afb)
commit 9c4475ae343c31475512a28ffa834fbd5009de1f
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Wed Jul 10 11:06:39 2013 +0200
Bug 10564 - use OPACURLOpenInNewWindow in UNIMARCslim2OPACResults.xsl
When using UNIMARC XSLT for OPAC detail page, if record has an 856$u,
its content is displayed as a link. The syspref OPACURLOpenInNewWindow
adds the option of opening in a new window (attribute target="_blank").
856$u is also used in UNIMARC results XSLT but the use of
OPACURLOpenInNewWindow syspref is missing. It exists for MARC21.
This patch adds the use of OPACURLOpenInNewWindow in UNIMARCslim2OPACResults.xsl.
Test plan :
- In a UNIMARC catalog, enable XSLT for OPAC results page
- Create a record with a link in 856$u and set second indicator to 0
- Set OPACURLOpenInNewWindow syspref on
- At OPAC, perform a search that contains the record
=> You should see the link : "Click here to access online"
- click on it
=> You shoud get to a new window (or tab depending on your browser configuration)
- Set OPACURLOpenInNewWindow syspref off
- re-perform the search
- click on the link
=> You shoud stay in same window
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Comment: Work as described, no koha-qa errors
Tested following plan after applying patch
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
XSLT change only, works as described.
To test: Catalog 856$u and $a, 2nd indicator = 0.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit bc240a908d0fbc50b099df04e61da9fbb55fab52)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 815a7cb6b94455d4e0a0ea88f7cd0bcb8621cd6e)
commit 8770b02fa4ca904f5ab209150242d24c3390544a
Author: Janusz Kaczmarek <januszop at gmail.com>
Date: Fri May 24 14:38:10 2013 +0300
Bug 10331 - Little errors in unimarc_field_4XX.pl (punctuation)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Comment: Work as described, no koha-qa errors
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Copying the test plan from the bug report:
A.
1) have $a active in one of the linking fields (like 461, 463, etc.).
2) have a biblio record with the field 700 $a, $b, $f filled up
3) go to cataloguing -> field 4XX of your choice, use the plugin to
fetch data from biblio rec. mentioned in 2)
4) see the punctuation in $a -- it will be wrong (no closing bracket)
B.
1) have $a active in one of the linking fields (like 461, 463, etc.).
2) have a biblio record with the field 700 $a, $b, $c, $f filled up
3) go to cataloguing -> field 4XX of your choice, use the plugin to
fetch data from biblio rec. mentioned in 2)
4) see the punctuation in $a -- it will be wrong (dash instead of
semicolon between original $c and $f, no closing bracket)
C.
1) have $a active in one of the linking fields (like 461, 463, etc.).
2) have a biblio record with the field 702 $a, $b, $c filled up
3) go to cataloguing -> field 4XX of your choice, use the plugin to
fetch data from biblio rec. mentioned in 2)
4) see the punctuation in $a -- it will be wrong (unnecessary semicolon
after original $c, n.b. lacking space).
D.
1) have $a active in one of the linking fields (like 461, 463, etc.).
2) have a biblio record with the field 712 $a, $b filled up
3) go to cataloguing -> field 4XX of your choice, use the plugin to
fetch data from biblio rec. mentioned in b)
4) see the punctuation in $a -- it will be wrong (unnecessary opening
bracket at the end).
Test plan, all tests and QA script pass.
Thx Bernardo for his testing and explanations!
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 86c08e63a25afa86c9051f070d819ddac675425d)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 70a6226cf7de15a74cb6f82dc14bf4568255fb95)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 70a6226cf7de15a74cb6f82dc14bf4568255fb95)
commit 20e11030e5060bc7eab1734b45e3bd5e4ca0f5e9
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Feb 1 10:40:50 2013 -0500
Bug 9531: Make SIP2 message terminator configurable via SIPconfig.xml
Add a terminator option to SIPConfig.xml, choices for 'terminator' are
'CR' or 'CRLF'. The default continues to be 'CRLF' if 'terminator' is
undefined.
Test Plan:
1) Apply patch
2) Start SIP server
3) Run C4/SIP/t/04patron_status.t
4) Stop SIP server
5) Add terminator="CR" for account login 'term1'
6) Run 04patron_status.t again, you should see no change
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
Signed-off-by: Adrien Saurat <adrien.saurat at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 90e2aafeb538f2d5e52fd1d32fce528f72076df8)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit b0474ebcf0a83cbbe8484b95986b350162959188)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit b0474ebcf0a83cbbe8484b95986b350162959188)
commit e5eab778ce68e4187466b4fac0456d7e322d6ff3
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Aug 1 10:09:51 2013 -0400
Bug 10619 - fix errors in sco.css for the CCSR OPAC templates
sco.css is not missing from CCSR, but some image paths in the CSS are
incorrect, resulting in some missing images. This patch corrects those
broken paths.
This patch also hides the Cart/Lists/login region of the template which
should not be visible in self checkout.
To test, enable self-checkout and switch to the CCSR theme. Load a
patron for self-checkout and confirm that images associated with buttons
appear correctly: By the help link in the upper-right, on the 'Finish'
button, etc. Try checking out an item which is already checked out to
that patron to see more examples.
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
CSS changes only, works nicely.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 794f0f28c931ae885232c23d02f94bfed66158f5)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 668e9cfcf4b678658a51652f59b527ce5953f2c6)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 668e9cfcf4b678658a51652f59b527ce5953f2c6)
commit 70924e8001f6128d6f813d59b2d7a5be17bb6b8d
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Sep 5 15:27:58 2013 -0400
Bug 10027: (follow-up) improve display of fine details on printed invoice
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script.
Checked invoice is correctly printed for
- partially paid fines
- paid fines
- unpaid fines
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit e30612bb3f0465363842ff4269245095d32dee3b)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit bf33bd5cafce6a166f5c0e54098ab38c9ac59615)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit bf33bd5cafce6a166f5c0e54098ab38c9ac59615)
commit aebb1b51125eaf1924f57b830e6b52c74e2154d8
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Apr 10 13:49:16 2013 -0400
Bug 10027: (follow-up) tidy members/printinvoice.pl
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 70f23f2a69a66b76d411f81787e8e63e0a87a2a1)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 629f31a79df41547db20aff5b63134ef1fd85e89)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 629f31a79df41547db20aff5b63134ef1fd85e89)
commit 5c448893ba259ba527bd9af1abfaf2c5978778b0
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Apr 10 13:45:18 2013 -0400
Bug 10027: include fine details when printing a fine
Previously printing a fine invoice would result in a page with both the
single item charge and the total outstanding amount. Right now only the
total outstanding is printed.
Test Plan:
1) Print a fine, note the fine doesn't show, only the total
2) Apply patch
3) Print a fine, not the fine does show
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 2fa06f48d957f7ea39286a52513a580e2ed5b13e)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 31751808fa4a97f97157561bc36ec1fc43c13a09)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 31751808fa4a97f97157561bc36ec1fc43c13a09)
commit a462fef1259899878701d841d9d1b56381019782
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 9 09:50:49 2013 -0400
Bug 7478: fix template translation problem in catalogue_out.tt
The items with no checkouts template has a sections that uses DEFAULT to
set some strings: [% DEFAULT loopro.itemcallnumber="No Call Number" %]
This appears to be untranslatable with our current translation tool.
This patch changes the template so that it uses a simple [% IF %] block
to display the default text if no value is set. Added is use of the
Branches template plugin to show library name instead of code.
This patch also fixes an error introduced in my fix for Bug 8124 causing
the page to default to CSV download instead of output to screen.
To test, apply the patch and confirm that the default text appears
onscreen in reports which include results that have a missing barcode,
title, or call number. Results should be displayed on screen correctly.
Run "perl translate update" for any language and confirm that the newly
generated po file includes "No call number," "No barcode," and "NO
TITLE" for catalogue_out.tt
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works nicely, thx Owen!
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit b8e1e7e217363a165275dca46e7d123633a64920)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 4eff83df314743b72f09dc0d6e34080227cef658)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 4eff83df314743b72f09dc0d6e34080227cef658)
-----------------------------------------------------------------------
Summary of changes:
C4/SIP/Sip.pm | 20 +-
C4/SIP/Sip/MsgType.pm | 34 +-
cataloguing/value_builder/unimarc_field_4XX.pl | 16 +-
etc/SIPconfig.xml | 2 +-
.../prog/en/modules/members/printinvoice.tt | 12 +-
.../prog/en/modules/reports/catalogue_out.tt | 72 ++---
koha-tmpl/opac-tmpl/ccsr/en/css/sco.css | 39 ++-
.../prog/en/xslt/UNIMARCslim2OPACResults.xsl | 4 +
members/printinvoice.pl | 157 +++++-----
reports/catalogue_out.pl | 330 +++++++++-----------
10 files changed, 335 insertions(+), 351 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list