[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.08-49-g6783c84
Git repo owner
gitmaster at git.koha-community.org
Mon Jul 20 23:50:35 CEST 2015
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.18.x has been updated
via 6783c84d4548a71fdaf8bc20eb7f84f5d7f59c5a (commit)
via fab8da9b005f3a59502e1474d5da1d7e3a92e307 (commit)
via 1524b4fd0c0ca13fec0d56a1e30c7234030eb289 (commit)
via 0545b2f0a59b275b359ab1c578977bd617d0ea26 (commit)
via 05389408c3b1c3b9af910256cd1f257275d2c3b0 (commit)
via 3291c8e02f6fb28b4df5a09b35f9f9700d7bdca6 (commit)
via 6303d6a4dbb20525c595b4f18a97d01fbbf928ce (commit)
via 981c363d99cf049a08c5b7bde4c03df2a92f766c (commit)
via a1e9b4e1edfd7bc870b3ddd0150fac7b2fd51733 (commit)
via 7763257f019f8cb9ab7434e2d42d34fd73fd63bc (commit)
via 448bb04f04ee7a0ad24a8a8528ed909a8e90d1fa (commit)
via 055442cd0d404c49522794b79d269730e0d1ef6c (commit)
via a3099a7e5aeb635a879aec4a10fe7ebe3834a1dd (commit)
via f69c9023d7c24a06ee06db24b9825015ec3e5229 (commit)
via 48fc41ac5c97e6a34f93636a34b311f8ac2d850c (commit)
via efc9c0adde2666a6a8fc562ab1af3bd864ac6d72 (commit)
via f5974a72ab415d03a8b160be93a66230d7a239c5 (commit)
via d578222188d5da186d00826ab26de29b0cb4b969 (commit)
via 15b3b05346601da424baa510723f0e08497c6368 (commit)
via b086e3c39fe240dfb24b0e0a49223244938d54e8 (commit)
via 5b5197849a1e8726a194b87776ae4da004c5f74a (commit)
via 533ffe694bfeec2e628d12c2dab2b99ae7f3f843 (commit)
via 3a733cfe52809961d8657945a08e8a6e926ea842 (commit)
via 16efb376e6dda5f3fa819fe5d4a53f555262a1ea (commit)
via e80e4294647cf58f3d4b3cb9a8cc21d1033871a0 (commit)
via 13325b259775765e8842a1cf2fbe528d734144a9 (commit)
via 9a0408c029555ee8de98ca5e66844fc91544f9e6 (commit)
via 3cdaf5c221b9826b7438919770e320d43dfb4b3a (commit)
via 9c91b66ff6b3cdb2e02aaa464af2b3f71fbfdcc9 (commit)
via 2db93a5a02229279216e15d39265c7976ca82ea4 (commit)
via 0a8fa52649ca25b7e6f6425ded46018329232c62 (commit)
via a8ca01cc2291e026fb8c83c0e3138b337e378670 (commit)
via cb220b605e7ed559b478e6e502802670fded780d (commit)
via d04fa7b258f94f4cc65398ae2a98e55c9e95ea58 (commit)
via 957acc5a815b1d8c63aa0ff24a1fed99bc271bc9 (commit)
via 7b2207888394c9a49b5764939667534224f1b0fa (commit)
via 490ad5e19132f9d54c03bba2bd2d2dc4b4cfbe04 (commit)
via 3db143ccee82ffacb0a92e1f07ec3a8c52c6ba59 (commit)
via b9185c4aa87e26fae0a1a30614c8f03b58f60808 (commit)
via 4f96b7c330886c8213c7df7b21dd5fdf42b87537 (commit)
via 6cefaa2ae4eb09f441c2a3576e0b9ba98aadfb17 (commit)
via 7b5f05e4777349718cce59fe612457d190a1c482 (commit)
via 3ddfda558196c057e6c66401ff640b9a32103ce0 (commit)
via ee97bdb58fcd15ab51c56f3c8487357a5a0b8e3d (commit)
via aa357855e45d54e48b1ba6314b2761a1a847756e (commit)
via cf229ccc7f0612b96eb23a95a31faee4ed9021e4 (commit)
via ac92491d08b115059b8e85d781b38ded30dd7fbc (commit)
via 6650203b9e87c1d02d5a84cabaac16f5c24fff87 (commit)
via 7b7a8c8d3684f8f162890bd7fbce8ae0623641b5 (commit)
from 0580342093946f59e8f0f1320f136ad085abe305 (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 6783c84d4548a71fdaf8bc20eb7f84f5d7f59c5a
Author: Liz Rea <wizzyrea at gmail.com>
Date: Thu Jul 16 12:32:08 2015 +0000
Bug 14290 - fix number of columns in footer for 3.18
Jonathan pointed out that the smart rules table is slightly different in 3.20, this commit cleans it up for 3.18.
commit fab8da9b005f3a59502e1474d5da1d7e3a92e307
Author: Liz Rea <wizzyrea at gmail.com>
Date: Thu Jul 16 12:30:51 2015 +0000
Revert "Bug 14290 - fix number of columns in footer for 3.18"
This reverts commit 1524b4fd0c0ca13fec0d56a1e30c7234030eb289.
extra stuff in here, oops.
commit 1524b4fd0c0ca13fec0d56a1e30c7234030eb289
Author: Liz Rea <wizzyrea at gmail.com>
Date: Thu Jul 16 12:25:14 2015 +0000
Bug 14290 - fix number of columns in footer for 3.18
Jonathan pointed out that the smart rules table is slightly different in 3.20, this commit cleans it up for 3.18.
commit 0545b2f0a59b275b359ab1c578977bd617d0ea26
Author: Julian FIOL <julian.fiol at biblibre.com>
Date: Mon Jul 6 12:27:08 2015 +0200
Bug 14496: Improving opac-detail.pl performances
Get notes and subjects from MARC record
ONLY when XSLT is not activated.
It's useless doing it when XSLT is activated,
because XSLT takes care of it by its own.
=> With this patch, we are saving precious
milliseconds
I compared the display of some records in XSLT view with and without patch, was the same (as expected).
Signed-off-by: Marc Veron <veron at veron.ch>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
On a slower server, I saw a time save of 0.0274 to 0.0908 seconds (with XSLT).
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 468d3d9c83a9760e796cdf43c7da2766ccf7c9b9)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 05389408c3b1c3b9af910256cd1f257275d2c3b0
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Thu Jul 2 10:37:22 2015 +0200
Bug 14485: HTML comment disables translation in cataloguing/addbooks.tt
In cataloguing/addbooks.tt, the line :
[% total %] result(s) found in catalog,
is not present in PO files even after an update.
I've found that the cause is the previous HTML comment line.
This patch converts HTML comment into TT comment and adds a div to have a more comprehensive string to translate.
Test plan :
- without patch
- go into <sources>/misc/translator
- run PO update for example in french : translate update fr-FR
=> the text "result(s) found in catalog" is missing from PO file : fr-FR-staff-prog.po
- restore default PO files
- apply patch
- go into <sources>/misc/translator
- run PO update for example in french : translate update fr-FR
=> You find text "result(s) found in catalog" in PO file : fr-FR-staff-prog.po
Sponsored-by: Universidad de El Salvador
Signed-off-by: Hector Eduardo Castro Avalos <hector.hecaxmmx at gmail.com>
Works as advertised. Just one msgid appear with msgid "%s result(s) found in catalog,"
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit e2ab42716825c5dedbb0036ae56a28e6119083f5)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 3291c8e02f6fb28b4df5a09b35f9f9700d7bdca6
Author: David Cook <dcook at prosentient.com.au>
Date: Tue Jun 9 14:25:23 2015 +1000
Bug 14366: Units doesn't get saved usefully for patroncards
This patch causes the "Units" to be saved and displayed correctly
for the "Edit layout" screen in Patroncards.
_TEST PLAN_
Before applying:
0) Create a new layout
1) Edit the layout, change the units, and click Save
2) Edit the layout again, and notice the units are still "PostScript Points"
Apply the patch:
3) Edit the layout again, change the units, and click Save
4) Edit the layout again, note that the units have changed to your
selection
5) Rejoice
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit f573a155974c84a6fb433bff86a220d4644ad27e)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 6303d6a4dbb20525c595b4f18a97d01fbbf928ce
Author: Nick Clemens <nick at quecheelibrary.org>
Date: Tue Jun 16 21:48:18 2015 -0400
Bug 13950: Sort Item search home library list by branch name
On the item search form the list of home libraries isn't sorted
alphabetically by their descrption.
To test:
- Ensure that you have libraries whose code/name are sorted in a different alphabetical order (e.g. Aardvark/ZZZ & Zebra/AAA)
- Staff: Advanced search - item search
- See that libraries are sorted in code order
- Apply patch
- Verify selection block for home library is correctly sorted after
applying the patch.
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 958be9804a50c3e13f74c4d5f81348e2256a8042)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 981c363d99cf049a08c5b7bde4c03df2a92f766c
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Thu Jun 25 15:38:42 2015 +0200
Bug 14453: (followup) Fix shipped XSLT files
Make the shipped XSLTs for authorities (MARC21 and UNIMARC) the same as the generated version
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit fbe25b1d8e1806768b04d829bd9fc1a05f4861cf)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit a1e9b4e1edfd7bc870b3ddd0150fac7b2fd51733
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Jun 24 16:06:05 2015 +0200
Bug 14453: kohaidx is missing for id in authority-koha-indexdefs.xml
In authority-koha-indexdefs.xml, all tags use the namespace "kohaidx" except the tag "id".
When re-generating authority-zebra-indexdefs.xsl, the line :
<xslo:variable name="idfield" select="normalize-space(marc:controlfield[@tag='001'])"/>
is modified :
<xslo:variable name="idfield" select="normalize-space()"/>
This is an error.
This patch adds kohaidx namespace to correct.
Test plan :
- Without patch
- go to etc/zebradb/marc_defs/marc21/authorities/
- run : xslproc xsltproc ../../../xsl/koha-indexdefs-to-zebra.xsl authority-koha-indexdefs.xml > authority-zebra-indexdefs.xsl
- read authority-zebra-indexdefs.xsl
=> the line has changed : <xslo:variable name="idfield" select="normalize-space()"/>
- Apply patch
- go to etc/zebradb/marc_defs/marc21/authorities/
- run : xslproc xsltproc ../../../xsl/koha-indexdefs-to-zebra.xsl authority-koha-indexdefs.xml > authority-zebra-indexdefs.xsl
- read authority-zebra-indexdefs.xsl
=> the line has not changed
(same for unimarc flavor)
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
As Mirko mentioned, the xslt's now generate the facet-processing templates in
the authority xslt's too. They are harmless because we don't define facets
for authority records. If we did, it would be harmless too.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 2365537eea9d5cd6526843b1cd0c2152a6def06c)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 7763257f019f8cb9ab7434e2d42d34fd73fd63bc
Author: Winona Salesky <wsalesky at gmail.com>
Date: Wed Jun 3 22:46:23 2015 -0400
Bug 14326: XSLT Syntax error in MARC21slimOPACResults.xsl
Test Plan:
1) Apply this patch
2) Ensure you are using the default XSLT setting for the staff and opac record details
3) Perform an opac search check "Availability" for expected display values.
5) Note this patch corrects invalid syntax in xslt, there should be no visable changes to the results page.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 058b50de5b09ee2ba3efc953b9846bc79d712c31)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 448bb04f04ee7a0ad24a8a8528ed909a8e90d1fa
Author: Indranil Das Gupta <indradg at l2c2.co.in>
Date: Mon May 4 18:55:15 2015 +0530
Bug 14135: Adds 'Free' to variabletypes in systempreferences.tt
The 'Local Use' system preference addition/modification template provides the following options against "Variable Type" - Choice, YesNo, Integer, Textarea, Float, Themes, Languages, Upload or ClassSource.
There is no option presented for "Free" which seems to be the most
used variable type out-of-the-box (i.e. INTRAdidyoumean,
OPACdidyoumean, UsageStatsID and UsageStatsLastUpdateTime)
This trivial patch proposes to modify the systempreferences.tt
and add the option 'Free' to the list offered to users.
Test Plan
=========
1/ Go to Home > Administration > System preferences > Local use
2/ Click on 'New preference'.
3/ In the fieldset 'Koha Internal', the variable types offered
are Choice, YesNo, Integer, Textarea, Float, Themes,
Languages, Upload or ClassSources.
4/ Clicking on 'Choice' should set the 'preftype' field as
'Choice'.
5/ Apply this patch.
6/ Refresh the page.
7/ The variable types list should read - "Free, Choice, YesNo,
Integer, Textarea, Float, Themes, Languages, Upload or
ClassSources".
8/ Clicking on 'Free' should set the 'preftype' field as 'Free'.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
NOTE: Discovered that there is no validation on the type field.
However, that is beyond the scope of this bug.
Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 9f008a102415c8b71a1f4a976bc15691c2663b5c)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 055442cd0d404c49522794b79d269730e0d1ef6c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jul 3 11:02:22 2015 +0200
Bug 14382: [QA Follow-up] Bad regex alarm
The regex /|date>>/ will match much more than you like :)
The unescaped pipe is bad, but you also need to remove the >> because
the split a few lines above it removes them already.
This allows you to recover from an error like this one, running another
report with a string parameter:
The given date (india%) does not match the date format (us) at
Koha/DateUtils.pm line 144.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Amended for possible spaces around the word date.
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit bfea40b6e8161629c11d97be5eeba56fb6d59ba3)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit a3099a7e5aeb635a879aec4a10fe7ebe3834a1dd
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Jun 24 12:13:46 2015 -0400
Bug 14382: Non-ISO Date parameters generate empty reports.
The issue is that SQL expects ISO dates, but the user may wish to view dates according to the dateformat system preference.
By detecting a date preference, the non-ISO dates can be converted to ISO dates before being stuffed back into the SQL query to be executed.
TEST PLAN
---------
1) Add a report with date parameters.
-- I used 'Holds placed in date range' from
http://wiki.koha-community.org/wiki/SQL_Reports_Library
2) Set your dateformat to YYYY-MM-DD
3) Run the report
-- Note the SQL reads
"... BETWEEN '{date formatted in YYYY-MM-DD}'..."
-- If there is supposed to be data, there is some.
4) Set your dateformat to MM/DD/YYYY
5) Run the report
-- Note the SQL reads
"... BETWEEN '{date formatted in MM/DD/YYYY}'..."
-- If there is supposed to be data, there is none.
6) Apply patch
7) Repeat steps 2-5
-- The SQL will always read YYYY-MM-DD (ISO) format.
-- The report will have data, if there is some.
8) koha qa test tools.
Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Adding a QA follow-up.
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit c3fea53039a6c53c766b0403eedd57f644c6f772)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Conflicts:
reports/guided_reports.pl
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit f69c9023d7c24a06ee06db24b9825015ec3e5229
Author: Liz Rea <wizzyrea at gmail.com>
Date: Thu Jul 16 10:13:07 2015 +0000
Bumping database version
commit 48fc41ac5c97e6a34f93636a34b311f8ac2d850c
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Jun 25 17:22:25 2015 -0400
Bug 9942: [QA Followup] - Add test and alert to returns.pl
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit efedadebf233cf7f2b8c1eb64d1687b282d94474)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit efc9c0adde2666a6a8fc562ab1af3bd864ac6d72
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Apr 9 13:07:05 2015 +0200
Bug 9942: Make Koha fail if privacy is not respected
If a patron has requested anonymity on returning items and the system is
not correctly configured (AnonymousPatron no set or set to an inexistent
patron), the application should take it into account and not fail
quietly.
This patch is quite radical: the script will die loudly if the privacy
is not respected.
To be care of the bad "Software error", some checks are done in the
updatedatabase to be sure the admin will be warned is something is wrong
in the configuration.
Test plan:
1/ Test the updatedatabase entry:
a. Turn on OPACPrivacy and set AnonymousPatron to an existing patron
=> You will get a warning
b. Turn on OPACPrivacy and set AnonymousPatron to 0 or ''
=> You will get a warning
c. Turn on OPACPrivacy and set the privacy to 2 (Never) for at least 1 patron
Turn off OPACPrivacy
=> You will get a warning
d. In all other cases you will get no error
2/ Test the interface
a. Turn on OPACPrivacy and set the privacy to 2 (Never) for a patron
b. Now you can turn off OPACPrivacy or keep it on, behavior should be
the same
c. check an item out the patron
d. Check the item in using the check out table
=> fail
e. Check the item in using the Check in tab
=> fail (not gracefully).
Note that the software error could appear on other pages too.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Updatedatabase works as described
On staff, if don't have correct settings for anonymity it's
impossible to check-in (with OPACPrivacy on)
No errors
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 94315f663b8a582fb7ef68de2bd9c3933901cd7f)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit f5974a72ab415d03a8b160be93a66230d7a239c5
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Jun 25 16:41:23 2015 -0400
Bug 14467: Security updates break some Koha plugins
The new security updates break previously functioning plugins, most
notably the cover flow plugin and the Ebsco EDS plugin.
Test Plan:
1) Install and configure the cover flow plugin ( http://bywatersolutions.com/koha-plugins/ )
2) Note that attempting to access coverflow.pl from the OPAC results in an error
3) Apply this patch
4) Note that coverflow.pl now output html again
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit e0d2bc669e385cfd1c42c1e83aaff3495a75a822)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit d578222188d5da186d00826ab26de29b0cb4b969
Author: Liz Rea <liz at catalyst.net.nz>
Date: Tue Jun 16 16:12:57 2015 +1200
Bug 14389: Editing a syspref in a textarea does not enable the Save button
Test plan:
1. Navigate to the "opaccredits" syspref (or any other textarea, i.e.,
"Click to Edit", syspref) in the system preferences editor.
2. Change its contents, by either pasting or typing. The field may not
be marked as modified, even after you click outside the box.
3. Apply the patch.
4. Reload the page and try again; either pasting or typing should mark
the field as changed and allow you to save.
Signed-off-by: Jesse Weaver <pianohacker at gmail.com>
Confirmed working for normal input, paste and middle-click paste in
Chrome and Firefox in Linux.
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit c95e794bd458377d742280ae8fff281ddf395e04)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 15b3b05346601da424baa510723f0e08497c6368
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Tue Jun 23 10:40:15 2015 +0200
Bug 14324: Display "Add Child" for Organisations on circ/circulation.pl
On moremember, the button is displayed for Organisations.
To be consistent, it should be displayed on the circulation page too.
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 198e6669eeb68519b4909d99631d84aed068845e)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit b086e3c39fe240dfb24b0e0a49223244938d54e8
Author: Barton Chittenden <barton at bywatersolutions.com>
Date: Thu Jun 18 13:31:28 2015 -0700
Bug 14324: Set "adultborrower" regardless of guarantor status.
Signed-off-by: Jason Robb - SEKLS (jrobb at sekls.org)
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit f05931e05154cc85df4036fe7c4acdfc0ddb5995)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 5b5197849a1e8726a194b87776ae4da004c5f74a
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Apr 1 16:23:48 2015 +0200
Bug 8802: On editing a library group category type is not set
The category type was always set to 'searchdomain', because it's the
first of the dropdown list.
Test plan:
1/ Create or edit a library group
2/ Set the category type to "properties"
3/ Edit it again
4/ Confirm "properties" is correctly selected
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit fc6789c20636f8104854b74209b658634831f4e5)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 533ffe694bfeec2e628d12c2dab2b99ae7f3f843
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Jun 8 01:30:58 2015 +0200
Bug 14356: Improvements to the 'Transfers to receive' page
Patch makes several small changes to the template for the
'Transfers to receive page'
1) Show the branch name instead of the branchcode in the
table of incoming transfers.
If there is a hold connected with the transfer:
2) Show the patron's name as 'surname, firstname'
intead of 'surname firstname'
3) Restore broken feature: Show a mailto: link with a
generated subject of 'Hold: <title>'.
The mailto: feature actually existed in the templates, but
was broken to a misnamed database column. I made some small
changes to make the subject translatable (see bug 8330).
To test:
- Create a transfer by placing a hold with pickup at another library
- Craete a transfer manually
- Go to the circulation > transfers to receive
- Check the changes explained above, compare before and after
- Check the mailto: link works as expected
Bonus: Check the Hold: bit in the subject is really translatable now.
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit e5cea455d00c52b4a81e87b4dc77315c03ce8630)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 3a733cfe52809961d8657945a08e8a6e926ea842
Author: Nicolas Legrand <nicolas.legrand at bulac.fr>
Date: Thu May 28 16:32:29 2015 +0200
Bug 14290: Add a table foot to circulation matrix
Reprint circulation matrix header in a footer helps editing entries in
big matrix. Otherwise, the header disapears and it's hard to tell
which columns we're editing.
Test plan : try do add, modify or delete some entries in the
circulation matrix, everything should work as expected.
Patch works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 1ea3465d30b1b0fcd12a5592ce5a4c34a9a58462)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 16efb376e6dda5f3fa819fe5d4a53f555262a1ea
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Wed Jun 17 13:22:49 2015 -0300
Bug 12616: Locale in subscriptions not preselecting correctly
There is a problem if a language is present but
don't have ISO639-2 code. Locale pulldown on serial
suscription is malformed.
To reproduce on master:
a) remove some entries on language_rfc4646_to_iso639
b) go to Serials > New suscription
c) Put any value on Vendor and record, press Next>>
d) Look at locale pulldown, it must default to last
removed lang from a), also other langs has no value
and are also 'selected' on html
To test:
1) Reproduce the problem
2) Apply the patch
3) Add New suscription, pulldown must be fixed
NOTE: Deleted Urdu and Chinese.
Master had both "selected" in the HTML.
Applied patch, neither were added.
Defaults to first item, which is blank meaning English.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit b9c4061479235d0d79ecbd917b015db5441d8118)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit e80e4294647cf58f3d4b3cb9a8cc21d1033871a0
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Jun 8 05:29:16 2015 +0200
Bug 13874: 'Rotating collections' are a circulation tool
Moves the entry for 'Rotating collections' from the Catalog
column to the 'Patrons and circulation' column.
To test:
- Verify the entry has been moved on the tools home page
NOTE: I agree that collections makes more sense under the new
column.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit da8ec2d37a43c87ad5b087511dd8e4ce082f022f)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 13325b259775765e8842a1cf2fbe528d734144a9
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Apr 15 12:33:29 2015 -0400
Bug 14001: Inventory has bad $_ references
After receiving an error while attempt a simple inventory run,
Two lines were changed from:
...$_->...
to
...$item->...
since the loop variable is $item. And $_ is not set to the
expected hash reference, when there is a loop variable.
This also helps explain the "Why are there blank dates on my
last seen field?" problem that has been mentioned by users.
TEST PLAN
---------
1) Apply this patch after a reset to master.
2) Log in to staff client
3) Add one item via z39.50, setting barcode to a known value (BARCODE1)
4) Wait for the reindex
5) Home -> Tools -> Inventory/Stocktaking
6) Browse for a file with the barcode in it
7) Set the library dropdown to the library branch of the added item.
8) Check 'Compare barcodes list to results:'
9) Click 'Submit'
-- This should not die under plack.
This should not generate blank last seen dates.
The last seen dates should be as expected.
10) run koha qa test tools
11) Confirm the two change point correspond to the two change points
in the patch which shall not be pushed to master.
The test result comply with expected outcome outlined in test plan.
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 3ebc081962247ce0c598da810451c459909842bc)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 9a0408c029555ee8de98ca5e66844fc91544f9e6
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date: Wed Jun 17 12:28:39 2015 +0200
Bug 14401: Zebra index configuration doesn't allow exact search for C.
2 lines in the Zebra configuration files prevent an exact search for C.,
while all other [A-Z]. searches work correctly.
After taking a look at the /etc/zebradb/etc/word-phrase-utf.chr
those 2 lines cause the problem:
map (^c\.) @
map (^C\.) @
I propose to remove them.
To test:
- Catalog a record with an item with callnumber: C.
- Catalog a record with an item with callnumber: B.
- Try seaching for the second using callnum,ext:B. (exact field search)
- Verify search works.
- Try searching for the other with callnum,ext:C.
- Verify no result.
- Apply the patch - copy the zebra config file if necessary into the right spot
- Reindex
- Repeat searches - both should not bring up the correct record.
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit f86743d893b61a4609d2f02a175db9944710067e)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 3cdaf5c221b9826b7438919770e320d43dfb4b3a
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Wed May 27 12:25:34 2015 +1200
Bug 14394: fix documentation of OpacHiddenItems
The current documentation of OpacHiddenItems told people to go and read
a file on the server, which most people don't have access to. This
replaces it with a link to the wiki.
http://bugs.koha-community.org/show_bug.cgi?id=14394
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
It doesn't apply for some reason. Fixed
Added target attribute to open in new window/tab,
hope you don't mind.
Updated documentation
No errors
Belongs to Aleisha or Robin?
Update assignee please :)
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 865321f3726c3b6065ef72107017c4171630d140)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 9c91b66ff6b3cdb2e02aaa464af2b3f71fbfdcc9
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Jun 19 09:00:33 2015 -0400
Bug 14422: Typo in updatedatabase.pl
TEST PLAN
---------
1) backup db
2) git checkout -b my_3.6.x origin/3.6.x
3) drop db and create blank one
4) git reset --hard origin/3.6.x
5) run web installer
6) set HomeorHoldingBranchReturn system preference to 'holdingbranch'.
7) create a Default checkout, hold rule
home -> koha administration -> Circulation and fines rules
-- I put 10 checkouts total and clicked 'Save'
-- there currently is not 'returnbranch' in default_circ_rules.
8) git reset --hard origin/3.20.x
-- or whatever version you apply this to
(3.8.x, 3.10.x, 3.14.x, 3.16.x, 3.18.x, or 3.20.x
-- 3.21.00.008 deletes the systempreference involved)
9) ./installer/data/mysql/updatedatabase.pl
10) check HomeorHoldingBranchReturn systempreference
-- Currently says 'holdingbranch', but
the value of 'returnbranch' in default_circ_rules is
'homebranch'.
11) repeat steps 3-8
12) apply this patch
13) repeat steps 9-10
-- Currently says 'holdingbranch', and
the value of 'returnbranch' in default_circ_rules is
'holdingbranch'.
14) run koha qa test tools
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Tested using 3.6.x install, updated to 3.8.x
Value is preserved
No errors
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Note: I haven't followed the test plan, but the fix is trivial.
Maybe it could worth to upate 3.21.00.008 and check the value of
HomeOrHoldingBranchReturn before deleting it.
We could raise a warning if HomeOrHoldingBranchReturn ==
'holdingbranch'.
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 8c91ca7903846da0cf7a73914a0b78484c0429df)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 2db93a5a02229279216e15d39265c7976ca82ea4
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Jun 8 02:15:03 2015 +0200
Bug 4925: Remove Smithsonian as a delivered z39.50 target
Removes the Smithsonian as a target installed with the
sample data during installation.
Also adds the newer LOC authority targets to files where
they were missing.
To test:
- Verify the Smithsonian has been removed from all
translated installers
- Verify the files are still valid SQL and install
correctly
NOTE: There was tiny scope creep which included ensuring
there were two Authority z39.50 servers as well.
Text files properly reflect the removal.
SQL 'source' of SQL files worked properly.
Was able to Z39.50 search for all of the 'en'.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 0ca21c1e488f150cca74beb9a67b285e5531f3b5)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 0a8fa52649ca25b7e6f6425ded46018329232c62
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Apr 15 12:39:05 2015 +0200
Bug 10172: Hide some uneeded stuffs on printing a record
When printing a record from the OPAC or the staff interface, some
uneeded blocks are displayed.
OPAC:
1/ Browse results
2/ The view tags (Normal, MARC, ISBD)
Intranet:
1/ Marc view link
2/ The Please upload one image link
Test plan:
On a record detail page (staff and OPAC), print the page and confirm
these blocks no longer appear.
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 68f0fe7b6f152a6db100525724c1ece507258652)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/css/print.css
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit a8ca01cc2291e026fb8c83c0e3138b337e378670
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Jun 8 02:58:53 2015 +0200
Bug 10119: Add note about CalculateFinesOnReturn to description of finesmode
This adds a note to the descrpition of the finesmode system
preference mentioning that CalculateFinesOnReturn is another
option for charging fines:
Note: Fines can also be charged by the CalculateFinesOnReturn system preference.
To test:
- Search for the finesmode system preference
- Verify the new text shows and is correct
NOTE: New text appears as expected. You can also just scroll for
it on the Circulation preferences tab.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 45c1b8f7b261493c27aa4d734e9795be619c1c70)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit cb220b605e7ed559b478e6e502802670fded780d
Author: Liz Rea <wizzyrea at gmail.com>
Date: Wed Jun 10 12:04:18 2015 +1200
spaces on dbupdate
commit d04fa7b258f94f4cc65398ae2a98e55c9e95ea58
Author: Marc Véron <veron at veron.ch>
Date: Tue Jun 2 09:54:15 2015 +0200
Bug 14313: OPAC - Adding a comment makes result browser disappear
To reproduce:
- Allow commenting in OPAC (Syspref reviewson)
- Log in to OPAC
- Do a search with many results
- Click on a biblio in result list
- Verify that you can browse the results in detail view ("Browse results")
- Repeat teh search above
- Click on the same biblio as above
- Add a comment (Tab "Comments")
- Close commenting window
- Click on "Next" in result browser
Result: The next biblio is displayed, but result browser has disappeared.
To test:
- Apply patch
- Try to reproduce issue above, verify that result browser does no longer disappear
AMended to remove whitespace chars. / MV
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Bug & solution checked, works well. No koha-qa errors
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 22c5c4b468b3584ed8bf45039c1494e969f2d66b)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 957acc5a815b1d8c63aa0ff24a1fed99bc271bc9
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Tue Jun 23 17:45:30 2015 +0200
Bug 14440: get_template_and_user can not have an empty template_name (opac-ratings.pl)
Since Bug 14408, the method get_template_and_user can not have an empty template_name.
Pages calling with an empty value should use C4::Auth::checkauth()
This patch corrects opac/opac-ratings.pl
Test plan :
- Apply patch
- Set sysopref OpacStarRatings to 'results and details'
- Disable Javascipt on your browser (otherwise it will use ajax)
- Login at OPAC
- Go to a record
- Click on a button left of 'Rate me' to choose a rating, ie 4
- Click on 'Rate me'
=> The page is reloaded and you see 'your rating: 4'
- Loggout from OPAC
- Try to access URL : http://<serveur>/cgi-bin/koha/opac-ratings.pl
=> You see the loggin page
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit f1acb5615d0cbcba5db5b84e12fbad3d41454347)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 3d8af819a84847b35ad08e62ba137d3febd878dd)
Conflicts:
opac/opac-ratings.pl
Signed-off-by: Liz <wizzyrea at gmail.com>
commit 7b2207888394c9a49b5764939667534224f1b0fa
Author: Eivin Giske Skaaren <eskaaren at yahoo.no>
Date: Fri Jun 19 13:08:29 2015 +0200
Bug 14421: Corrected example in SMS.pm to working version with hashref.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Test:
1) Apply patch
2) perldoc C4/SMS.pm
3) Check fixed argument in example
Argument is hashref, POD is now right
Added additional space on second arg
No errors
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 0cb82c8d02cc4b672b169c8b0261c4bb6360cd00)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz <wizzyrea at gmail.com>
commit 490ad5e19132f9d54c03bba2bd2d2dc4b4cfbe04
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Jun 19 11:24:57 2015 -0400
Bug 14425: Typo in C4::Context IsSuperLibrarian perldoc
TEST PLAN
---------
1) git checkout -b bug_14425 origin/master
2) perldoc C4::Context
/IsSuperlibr
-- see it is bad.
3) apply patch
4) perldoc C4::Context
/IsSuperLibr
-- see it is fixed.
5) koha qa test tools.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Fix typo, no errors.
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
% git grep -i IsSuperLibrarian|wc -l
55
% git grep IsSuperLibrarian|wc -l
55
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 2b255be22c919b11d690f4dcf8a5e84e93290878)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Liz <wizzyrea at gmail.com>
commit 3db143ccee82ffacb0a92e1f07ec3a8c52c6ba59
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Wed Jun 10 00:11:19 2015 +0200
Bug 11458: Improve confusing description of syspref 'gist'
The description of "gist" was:
"Default tax rates are ... (enter in numeric form, 0.12 for 12%.
First is the default. If you want more than 1 value, please
separate with |) "
The doubled use of "default" is confusing here.
With the patch it reads:
Tax rates are ... Enter in numeric form, 0.12 for 12%.
The first item in the list will be selected by default.
For more than one value, separate with | (pipe)
To test:
- Verify that the gist system preference description is
correct.
The use of "default" is confusing here.
Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 6c94fe52f954f93916993f71c472b068096806da)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Liz <wizzyrea at gmail.com>
commit b9185c4aa87e26fae0a1a30614c8f03b58f60808
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Tue Jun 9 02:32:46 2015 +0200
Bug 14215: Change the 'delimiter' syspref description for its wider use
Patch changes 'report files' to 'CSV files' as there are more
options now for downloading and creating CSV files where this
preference is taken into account.
To test:
- Verify the changed system preference description for
'delimiter' is correct.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 2eaeb708795e7624eb8873b617d4a38d69fa84fc)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Liz <wizzyrea at gmail.com>
commit 4f96b7c330886c8213c7df7b21dd5fdf42b87537
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Mar 24 17:01:30 2015 +0100
Bug 4137: Fix the OPACViewOthersSuggestions behavior
This pref does not work at all, the interface let the user choose to
list all suggestions, but whatever he chooses the suggestion list is the
same.
This patch cleans a bit the suggestedby management.
There are a lot of cases to test, because linked to 2 prefs:
AnonSuggestions and OPACViewOthersSuggestions.
1/ AnonSuggestions = 0 and OPACViewOthersSuggestions = 0
- A non logged in user is not able to make a suggestion.
- A logged in user is not able to see suggestions made by someone else.
2/ AnonSuggestions = 0 and OPACViewOthersSuggestions = 1
- A non logged in user is not able to make a suggestion.
- A logged in user is able to see suggestions made by someone else.
3/ AnonSuggestions = 1 and OPACViewOthersSuggestions = 0
- A non logged in user is able to make a suggestion.
The suggestedby field will be filled with the AnonymousPatron pref value.
He is not able to see suggestions, even the ones made by AnonymousPatron.
- A logged in user is not able to see suggestions made by someone else.
4/ AnonSuggestions = 1 and OPACViewOthersSuggestions = 1
- A non logged in user is able to make a suggestion.
He is able to see all suggestions.
- A logged in user is able to see suggestions made by someone else.
In all cases a logged in user should be able to search for suggestions
(except if he is not able to see them).
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
All use cases tested, work as expected
No errors
Only comment is perhaps (in the future) a gracefull failure
when AnonymousPatron is not set, or has '0' value
Message is DBIx::Class::ResultSet::create(): Column 'suggestedby' cannot be null at ...
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit be35039b55a351c97f2c1f9a5b373cb26ac5e0b0)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Liz <wizzyrea at gmail.com>
commit 6cefaa2ae4eb09f441c2a3576e0b9ba98aadfb17
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Apr 22 12:14:24 2015 +0200
Bug 10866: Hide patron's history if intranetreadinghistory is set to not allow
If set to "not allow", the intranetreadinghistory pref prevent staff
members to access patron's checkout history.
But:
1/ The page is still accessible if you know the url
2/ The history can be consulted on the item history page
Test plan:
0/ Don't apply this patch
1/ Set the intranetreadinghistory to allow
2/ Go on a patron's checkout history page
3/ Open a new tab and go on a item's checkout history page
4/ Set the intranetreadinghistory to not allow
5/ Refresh both pages => no change
6/ Apply this patch
7/ Refresh both page.
On the first page, you should see a warning
On the other one, you should see that the patron column is not displayed
anymore.
Followed test plan, results were as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
http://bugs.koha-community.org/show_bug.cgi?id=10886
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Nice addition!
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit d847b1d92a9df6db2bb5321f032f3ec13d6ba55d)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Liz <wizzyrea at gmail.com>
commit 7b5f05e4777349718cce59fe612457d190a1c482
Author: Magnus Enger <magnus at libriotech.no>
Date: Wed Jun 17 14:36:44 2015 +0200
Bug 14403: Remove warn in Koha::NorwegianPatronDB
Line 99 has an unconditional warn, left over from development:
warn "$combined_username => $combined_password";
This patch deletes the line i question.
To test:
No testing needed, just have a look at the diff and see that
it makes sense to delete the warn.
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit b740b1b412e11b1d540b243e7b1767cc0c1cb962)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Liz <wizzyrea at gmail.com>
commit 3ddfda558196c057e6c66401ff640b9a32103ce0
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Jun 8 05:04:56 2015 +0200
Bug 13427: jQuery Timepicker is not translated on returns page
The returns page was missing an include with the translated strings.
To test:
- Install an additional language, like de-DE
- Confirm the bug on the returns page
- Make sure SpecifyReturnDate is activated
- Open the datepicker, look at the time settings
- Apply the patch
- Reinstall the language, no update of the po files is needed
- Retest
- Verify, that now the time settings are translated
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Works as expected
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 688452ad7e9131a53a96bd826e6228e73494fa53)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Liz <wizzyrea at gmail.com>
commit ee97bdb58fcd15ab51c56f3c8487357a5a0b8e3d
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Jun 8 03:18:35 2015 +0200
Bug 11467: Bug Untranslatable srings in opac-detail.tt (IDreamBooks*, OpacBrowseResults)
Patch marks several strings in the Javascript on the OPAC detail
and result page for translation.
1) IDreamBooks*
- Activate the 3 IDreamBooks* system preferences
- Check the 'cloud' and additional content shows up correctly on
the detail and result pages
- Verify everything works as expected and the same as without the patch
2) OpacBrowseResults
- Activate OpacBrowseResults
- Do various searches
- Verify the nex, previous, browse result list features still
work the same as without the patch
Bonus: Check new strings appear in the .po files by updating one
language with the patch applied (perl translate update de-DE)
NOTE: Really should have read the test plan more closely.
I couldn't find the 'Go to detail:' section, until I clicked
'Browse results'.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 7ab873aaea298c787e93438012fa8792345664f4)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Conflicts:
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
Signed-off-by: Liz <wizzyrea at gmail.com>
commit aa357855e45d54e48b1ba6314b2761a1a847756e
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Wed Jun 24 11:03:22 2015 +0200
Bug 14440: get_template_and_user can not have an empty template_name (quote*_ajax.pl)
This patch uses check_api_auth instead of get_template_and_user.
Test plan:
Confirm that you are still able to access to the quote editor with the
edit_quotes permission.
Confirm that you are not if you don't have the permission.
wget your_url/cgi-bin/koha/tools/quotes/quotes_ajax.pl
should return "403 : Forbidden."
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 08871a324fa731ffdbbe87afde1ee145c604a22b)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz <wizzyrea at gmail.com>
commit cf229ccc7f0612b96eb23a95a31faee4ed9021e4
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Tue Jun 23 16:45:21 2015 +0200
Bug 14440: get_template_and_user can not have an empty template_name (updatesupplier.pl)
Since Bug 14408, the method get_template_and_user can not have an empty template_name.
Pages calling with an empty value should use C4::Auth::checkauth()
This patch corrects acqui/updatesupplier.pl
Test plan :
- Apply patch
- Connect to intranet with a user having "vendors_manage" permission
- Go to acquisition module
- Create a new vendor
- Click on "Edit vendor"
- Change some information and save
=> Your change is saved
- Connect to intranet with a user not having "vendors_manage" permission
- Try to access <intranet>/cgi-bin/koha/acqui/updatesupplier.pl
=> Access is denied
- Disconnect from intranet
- Try to access <intranet>/cgi-bin/koha/acqui/updatesupplier.pl
=> Access is denied
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 015c26a5e36dae5070eab57f400237715d93ae44)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit ac92491d08b115059b8e85d781b38ded30dd7fbc
Author: Liz <wizzyrea at gmail.com>
Date: Wed Jun 24 09:52:05 2015 +0000
Bug 14450: itemsearch no longer working
To test:
Click Advanced search in staff client
Click the link for "Go to Item Search" at the top of the page
Do a search, you should get results. Try some combinations and make sure it works like it should.
Signed-off-by: Jacek Ablewicz <abl at biblos.pk.edu.pl>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit f900ea03bf15746bd2c310b59f2fb06972f6bdee)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz <wizzyrea at gmail.com>
commit 6650203b9e87c1d02d5a84cabaac16f5c24fff87
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Tue Jun 9 18:20:52 2015 +0000
Bug 11011: Rephrasing 'in keyword' in OPAC authority search
Using 'in the complete record' rather than 'in keyword'. I think this fits well as it seems that this means the search looks anywhere in the record.
To test:
1) In the OPAC, click on Authority Search
2) Notice that in the drop-down menu for the 'Where:' field, there is an 'in keyword' option.
3) Apply patch
4) Now says 'in the complete record'
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 892d374b64fa4eed98955d75b517702f78f1ca40)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz <wizzyrea at gmail.com>
commit 7b7a8c8d3684f8f162890bd7fbce8ae0623641b5
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Jun 7 23:45:10 2015 +0200
Bug 8686: Raise required version of URI::Escape to 3.31
Raises the minimum required version of URI::Escape from
1.36 to 3.31.
TEST PLAN
---------
1) git branch -b bug_8686 origin/master
2) ./koha_perl_deps.pl -a | grep URI
-- it will list 1.36 required
3) git bz apply 8686
4) ./koha_perl_deps.pl -a | grep URI
-- it will list 3.31 required
5) koha qa test tools
NOTE: Also default in Ubuntu 14.04 LTS,
not just Wheezy as noted in comment #15.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signoff based on Nicole's comment (bug 9990 comment 6):
"This stops happening if you upgrade URI::Escape to
3.31. We should make it clear in the Perl Modules page that an upgrade
is needed."
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 7c0c92807f49ef61aa975e84cf26d42f7dfa425f)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz <wizzyrea at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 8 +--
C4/Circulation.pm | 28 +++++++---
C4/Context.pm | 2 +-
C4/Installer/PerlDependencies.pm | 2 +-
C4/Languages.pm | 3 +-
C4/SMS.pm | 4 +-
Koha/NorwegianPatronDB.pm | 1 -
Koha/Plugins/Base.pm | 3 +-
acqui/updatesupplier.pl | 11 +---
admin/branches.pl | 2 +-
catalogue/itemsearch.pl | 6 +--
circ/circulation.pl | 4 +-
circ/transferstoreceive.pl | 2 +-
etc/zebradb/etc/word-phrase-utf.chr | 2 -
.../authorities/authority-koha-indexdefs.xml | 2 +-
.../authorities/authority-zebra-indexdefs.xsl | 2 +
.../authorities/authority-koha-indexdefs.xml | 2 +-
.../authorities/authority-zebra-indexdefs.xsl | 2 +
.../mysql/de-DE/optional/sample_z3950_servers.sql | 3 +-
.../mysql/de-DE/optional/sample_z3950_servers.txt | 3 +-
.../mysql/en/optional/sample_z3950_servers.sql | 3 +-
.../mysql/en/optional/sample_z3950_servers.txt | 1 -
.../mysql/es-ES/optional/sample_z3950_servers.sql | 11 ++--
.../mysql/es-ES/optional/sample_z3950_servers.txt | 3 +-
.../mysql/pl-PL/optional/sample_z3950_servers.sql | 3 +-
.../mysql/pl-PL/optional/sample_z3950_servers.txt | 1 -
installer/data/mysql/updatedatabase.pl | 35 +++++++++++-
koha-tmpl/intranet-tmpl/prog/en/css/print.css | 8 ++-
.../intranet-tmpl/prog/en/js/pages/preferences.js | 2 +-
.../en/modules/admin/preferences/acquisitions.pref | 4 +-
.../prog/en/modules/admin/preferences/admin.pref | 2 +-
.../en/modules/admin/preferences/circulation.pref | 1 +
.../prog/en/modules/admin/preferences/opac.pref | 2 +-
.../prog/en/modules/admin/smart-rules.tt | 23 ++++++++
.../prog/en/modules/admin/systempreferences.tt | 2 +-
.../prog/en/modules/catalogue/detail.tt | 2 +-
.../prog/en/modules/catalogue/issuehistory.tt | 26 +++++----
.../{itemsearch.csv.tt => itemsearch_csv.tt} | 0
.../{itemsearch.json.tt => itemsearch_json.tt} | 0
.../prog/en/modules/cataloguing/addbooks.tt | 8 +--
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 6 +++
.../prog/en/modules/circ/transferstoreceive.tt | 13 +++--
.../prog/en/modules/members/readingrec.tt | 4 +-
.../prog/en/modules/tools/tools-home.tt | 9 ++--
koha-tmpl/opac-tmpl/bootstrap/css/print.css | 2 +-
.../opac-tmpl/bootstrap/en/includes/usermenu.inc | 12 ++---
.../bootstrap/en/modules/opac-authorities-home.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 9 ++--
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 4 +-
.../bootstrap/en/modules/opac-suggestions.tt | 57 ++++++++++++--------
.../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 2 +-
koha-tmpl/opac-tmpl/bootstrap/less/print.less | 5 ++
kohaversion.pl | 2 +-
members/moremember.pl | 3 +-
opac/opac-detail.pl | 31 ++++++-----
opac/opac-ratings.pl | 24 +++------
opac/opac-suggestions.pl | 46 +++++++++++-----
patroncards/edit-layout.pl | 7 +++
reports/guided_reports.pl | 9 +++-
t/db_dependent/Circulation/MarkIssueReturned.t | 55 +++++++++++++++++++
tools/inventory.pl | 4 +-
tools/quotes/quotes-upload_ajax.pl | 16 +++---
tools/quotes/quotes_ajax.pl | 16 +++---
63 files changed, 374 insertions(+), 193 deletions(-)
rename koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/{itemsearch.csv.tt => itemsearch_csv.tt} (100%)
rename koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/{itemsearch.json.tt => itemsearch_json.tt} (100%)
create mode 100644 t/db_dependent/Circulation/MarkIssueReturned.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list