[koha-commits] main Koha release repository branch 3.16.x updated. v3.16.12-53-ga694c3f
Git repo owner
gitmaster at git.koha-community.org
Sat Jul 25 15:23:07 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.16.x has been updated
via a694c3faccd20bd8bdc3e9e7801993df28d53b6e (commit)
via f9aacc69ad8cf778fd2b1c49384b01545bafb67b (commit)
via a6736a7e1660e09aab633e1493c45d39108c3a26 (commit)
via 06909e8ead42e74eda6b5af36731ece7226737c6 (commit)
via aff48ab48928027b6ea1528ebd3d81392e480764 (commit)
via f3965b7fb6912c75d55a0a007b1e4256e5f7f12e (commit)
via d35eb08bc91180c36ddc3fcb705b765d4b02bc2a (commit)
via 26ccf1b00ffcfeaf5cb4557f96df9cb352e5bf10 (commit)
via e61436eb14249aab12aea6e684cea76df45b6310 (commit)
via bc43710c790b61f639cf51eea6635dc58c128e40 (commit)
via e19702213ca11959fc83fbc403e3e14ee6e11d9d (commit)
via 13c9959c608eebd9523edcaac1cb7270abe5c67e (commit)
via 05ede4a16d6f054954878feb650d55aa418f4161 (commit)
via 2e07ea6512d2d1afa63786d3a2d8703b6b93509e (commit)
via b3339e8afa4d59877b3ccda1f1378b1e43ab0667 (commit)
via 87a5b94de94b9cb2936d49de258662a8f6c5524a (commit)
via 7c6c4e3ddf2bd10f11c002bdd4048e47bf4eb45e (commit)
via 1812e6ab09a7dc9ca8aa1604ff5cb6c7a9502999 (commit)
via 99a2002d35dbf9f8b512c294a30bf32d43c98a09 (commit)
via 45db6e12937625d59bc097b535d77d52a09f36ea (commit)
via ecae848cdf138c00a65bfda99347752bb3bcfb8c (commit)
via ecf4473fac8210039926bfef5c3b17fc3430785a (commit)
via 5ca9430d1e7233adfb8af461ddc5cecd7470c39f (commit)
via 65d406d3a63fab0cca336cf23202a4986f595280 (commit)
via 6a4f3bcd0e9d01d1370870260923ab537facd319 (commit)
via 8f9db880ee6d1d8f1f0d4c47a067e77a1c7f55e4 (commit)
via d9783d6e81d31a175677a4954f17e7b4cb99b8cf (commit)
via c212d9f4fc092ae355154949589b9d8aad5010a0 (commit)
via 43ecf4c778367de1900b22f3a3d6e816b91eed93 (commit)
via d2ad672404ea5a06ffe63b5264b3b58afb45593d (commit)
via bbc42b204b2ded11a9462c9bbd4be7dd99e3a44d (commit)
via bad18ee246e77bcbc41810a6594676d69408df92 (commit)
via 92ad0ac7ba7fabd33efc7648d5dfb6babeed4051 (commit)
via 7ae18b424eeabea044b873fd494c375aa22fb1f0 (commit)
via 4617eb7e12c3613512a4a4728d7061c441841873 (commit)
via 4ead8eeeb010197ce48dd4b27f31bfe852684a25 (commit)
via 81b8ce4fdda2340c9a95f9fe40a290d473840c0f (commit)
via 140d3fb95543c42c0cf630e2084038ebb25e5929 (commit)
via a1c83e28bc8264fb579f0269b289226571e66281 (commit)
via 6e06d103216488f86d1bbe215d391014f5b40f80 (commit)
via f9503c2290aeb018bc294e74687d18605822a9ae (commit)
via 8a9184c4bc0de4866f7bdf7f945133d71c868f5b (commit)
via 69a74bb8806ff78ef6a086bc71b831e15c5974bb (commit)
via 012b4bc5742859ee5a2edfe963056c4ee54897c4 (commit)
via 51c8e095fd0627b7551cdf0d602bdc21c83365cd (commit)
via 8161d1a5174f8fd63e0280cce1a750ad23a0e4f9 (commit)
via d67f513eb37e3b6769d6897ed10c51ed9d2c2431 (commit)
via 23de58d6e53a51276bdb8321f60efa1dfc93d643 (commit)
via a2cdb740bd9106c19bb5fb9435ca6ca6f1f74704 (commit)
via 5902d3ca6944d57256bbbcaf984509b8d282a4ea (commit)
via 0b96ac33da15bebd3728da01a9229e7f0fab0ec7 (commit)
via 5acd5c4a6ed9292be3faeda6f8e9beff3e299141 (commit)
via 148249423a1a88db52d0ba9d2fbb508a16869caf (commit)
from 04d1d375b1a6c9fa40d5df9559d6bd72ccf7d44d (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 a694c3faccd20bd8bdc3e9e7801993df28d53b6e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Jun 5 08:06:29 2015 -0400
Bug 14338 - Unable to delete patron images [3.16.x]
The call to RmPatronImage is still passing cardnumber as its parameter
instead of borrowernumber.
Test Plan:
1) Upload a patron image
2) Ensure the card number is not the same as the borrower number
3) Attempt to delete patron image
-- Image will remain
4) Apply this patch
5) Attempt to delete patron image
-- Image will be removed
6) run koha qa test tools
NOTE: Deletion worked in 3.16.x, though the message for
debugging differed (cardnumber vs. borrowernumber).
This effectively removes cardnumber from the URL and
messages for the delete operation.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit f9aacc69ad8cf778fd2b1c49384b01545bafb67b
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Sat Jul 25 04:24:42 2015 -0400
Bug 4925: Remove Smithsonian as a delivered z39.50 target [3.16.x]
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: Mason James <mtj at kohaaloha.com>
commit a6736a7e1660e09aab633e1493c45d39108c3a26
Author: Mason James <mtj at kohaaloha.com>
Date: Sat Jul 25 20:51:52 2015 +1200
Bug 14602 - Fix failing t/Creators.t test
to test..
1/ run t/Creators.t test from git repo, get a FAIL
2/ apply patch
3/ repeat step 1, get a PASS
mason at xen1:~/g/k/3.16.x$ sudo koha-shell -c 'export PERL5LIB=/home/mason/g/k/3.16.x ; cd /home/mason/g/k/3.16.x ; prove -v t/Creators.t' k316x1
t/Creators.t ..
1..16
ok 1 - use C4::Creators;
ok 2 - use C4::Creators::PDF;
ok 3 - testing new() works
ok 4 - testing pdf file created
ok 5 - testing Add() works
ok 6 - testing Bookmark() works
ok 7 - testing Compress() works
ok 8 - testing Font() works
ok 9 - testing FontSize() is set to 12 by default
ok 10 - testing FontSize() can be set to a different value
ok 11 - testing Page() works
ok 12 - testing StrWidth() returns correct point width
ok 13 - testing Text() writes from a given x-value
ok 14 - testing Text() writes to the correct x-value
ok 15 - testing End() works
ok 16 - test file /tmp/4YjPQDExeS created OK
ok
All tests successful.
Files=1, Tests=16, 1 wallclock secs ( 0.03 usr 0.01 sys + 0.48 cusr 0.05 csys = 0.57 CPU)
Result: PASS
commit 06909e8ead42e74eda6b5af36731ece7226737c6
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Fri Aug 8 14:48:59 2014 -0300
Bug 12647: PQF QueryParser driver and unit tests fixes
Due to Perl 5.18, QueryParser the default search class is no longer
'keyword' (see bug 12738), and needs to be set manually. This patch
adds a line that does that. The problem that gets fixed is with test
'super simple keyword query'.
The rest of the non-deterministically failing tests are due to the same
problem, keys returning differently sorted keys from hashes.
So this patch sorts keys in the step that concatenates attributes when building
the PQF queries (and tests get adjusted to match the now deterministic result).
I did that (sorting there) under Jared's recommendation. Hopefuly he will step
in and comment/fix any mistake I made. My main concern was a possible loss
in performance. That we agreed it is almost void, because of the tiny size
of the hash.
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
All tests are passing now again :)
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit aff48ab48928027b6ea1528ebd3d81392e480764
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Jun 12 17:04:03 2014 +0200
Bug 12411: Preferences values should be utf8 encoded
Test plan:
Fill OPACMySummaryNote or NoLoginInstructions with something like "éàç"
and verify the display is broken.
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit f3965b7fb6912c75d55a0a007b1e4256e5f7f12e
Author: David Cook <dcook at prosentient.com.au>
Date: Mon Jul 13 14:06:46 2015 +1000
Bug 14521 - SQL injection in local use system preferences
This patch fixes a SQL injection vulnerability in the local use
system preferences.
_TEST PLAN_
Before applying:
1) Go to Global System Preferences
2) Click on the "Local use" tab
3) Add a new preference with the value "') or '1' = '1' -- "
(be sure to include the space at the end after the comment --).
4) When the page refreshes, you should now see about 99 other system
preferences which shouldn't be showing up.
5) Apply the patch
6) Refresh the page
7) Note that you now only see a system preference for "') or '1' = '1' -- "
and the other actual local use system preferences.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit d35eb08bc91180c36ddc3fcb705b765d4b02bc2a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jul 13 15:44:23 2015 +0100
Bug 14524: Don't escape query_cgi with uri
According to the doc, we should not escape query_cgi with the uri
filter:
http://www.template-toolkit.org/docs/manual/Filters.html#section_uri
Since query_cgi can contains something like: "idx=kw&q=42", we should
not escape the & char
Test plan:
0/ Don't apply the patch
1/ Go on launch a search at the OPAC
2/ Click on the RSS icon
3/ You should arrive on
opac-search.pl?idx%3Dkw%26q%3D42&count=50&sort_by=acqdate_dsc&format=rss2
The & has been escaped.
4/ Apply the patch
5/ Now you should get result and see an url correctly formatted.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 26ccf1b00ffcfeaf5cb4557f96df9cb352e5bf10
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: Mason James <mtj at kohaaloha.com>
commit e61436eb14249aab12aea6e684cea76df45b6310
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: Mason James <mtj at kohaaloha.com>
commit bc43710c790b61f639cf51eea6635dc58c128e40
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: Mason James <mtj at kohaaloha.com>
commit e19702213ca11959fc83fbc403e3e14ee6e11d9d
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: Mason James <mtj at kohaaloha.com>
commit 13c9959c608eebd9523edcaac1cb7270abe5c67e
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: Mason James <mtj at kohaaloha.com>
commit 05ede4a16d6f054954878feb650d55aa418f4161
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: Mason James <mtj at kohaaloha.com>
commit 2e07ea6512d2d1afa63786d3a2d8703b6b93509e
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 b3339e8afa4d59877b3ccda1f1378b1e43ab0667
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: Mason James <mtj at kohaaloha.com>
commit 87a5b94de94b9cb2936d49de258662a8f6c5524a
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: Mason James <mtj at kohaaloha.com>
commit 7c6c4e3ddf2bd10f11c002bdd4048e47bf4eb45e
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: Mason James <mtj at kohaaloha.com>
commit 1812e6ab09a7dc9ca8aa1604ff5cb6c7a9502999
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: Mason James <mtj at kohaaloha.com>
commit 99a2002d35dbf9f8b512c294a30bf32d43c98a09
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: Mason James <mtj at kohaaloha.com>
commit 45db6e12937625d59bc097b535d77d52a09f36ea
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: Mason James <mtj at kohaaloha.com>
commit ecae848cdf138c00a65bfda99347752bb3bcfb8c
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: Mason James <mtj at kohaaloha.com>
commit ecf4473fac8210039926bfef5c3b17fc3430785a
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: Mason James <mtj at kohaaloha.com>
commit 5ca9430d1e7233adfb8af461ddc5cecd7470c39f
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: Mason James <mtj at kohaaloha.com>
commit 65d406d3a63fab0cca336cf23202a4986f595280
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: Mason James <mtj at kohaaloha.com>
commit 6a4f3bcd0e9d01d1370870260923ab537facd319
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>
Conflicts:
opac/opac-ratings.pl
commit 8f9db880ee6d1d8f1f0d4c47a067e77a1c7f55e4
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: Mason James <mtj at kohaaloha.com>
commit d9783d6e81d31a175677a4954f17e7b4cb99b8cf
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: Mason James <mtj at kohaaloha.com>
commit c212d9f4fc092ae355154949589b9d8aad5010a0
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.
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 43ecf4c778367de1900b22f3a3d6e816b91eed93
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: Mason James <mtj at kohaaloha.com>
commit d2ad672404ea5a06ffe63b5264b3b58afb45593d
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>
Conflicts:
opac/opac-ratings.pl
commit bbc42b204b2ded11a9462c9bbd4be7dd99e3a44d
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>
commit bad18ee246e77bcbc41810a6594676d69408df92
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: Mason James <mtj at kohaaloha.com>
commit 92ad0ac7ba7fabd33efc7648d5dfb6babeed4051
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: Mason James <mtj at kohaaloha.com>
commit 7ae18b424eeabea044b873fd494c375aa22fb1f0
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: Mason James <mtj at kohaaloha.com>
commit 4617eb7e12c3613512a4a4728d7061c441841873
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Mon Jun 22 10:56:26 2015 +0200
Bug 14426: Escape or use placeholders for sql parameters
Does this patch enough to prevent sql injection in borrowers_out.pl?
====================================================================
1. "Criteria" Parameter, Payload: ELT(1=1,'evil') / ELT(1=2,'evil')
====================================================================
echo -ne "POST /cgi-bin/koha/reports/borrowers_out.pl
HTTP/1.1\r\nHost: testbox:9002\r\nContent-Length:
186\r\n\r\nFilter=P_COM&Filter=&Limit=&output=file&basename=Export&MIME=CSV&sep=%3B&report_name=&do_it=1&userid=<username>&password=<password>&branch=&koha_login_context=intranet&Criteria=ELT(1=2,'evil')"
| nc testbox 9002
echo -ne "POST /cgi-bin/koha/reports/borrowers_out.pl
HTTP/1.1\r\nHost: testbox:9002\r\nContent-Length:
186\r\n\r\nFilter=P_COM&Filter=&Limit=&output=file&basename=Export&MIME=CSV&sep=%3B&report_name=&do_it=1&userid=<username>&password=<password>&branch=&koha_login_context=intranet&Criteria=ELT(1=1,'evil')"
| nc testbox 9002
====================================================================
2. "Filter" Parameter, Payload: P_COM'+AND+'a'='a / P_COM'+AND+'a'='b
====================================================================
echo -ne "POST /cgi-bin/koha/reports/borrowers_out.pl
HTTP/1.1\r\nHost: testbox:9002\r\nContent-Length:
183\r\n\r\nkoha_login_context=intranet&Limit=&Criteria=branchcode&output=file&basename=Export&MIME=CSV&sep=;&report_name=&do_it=1&userid=<userid>&password=<password>&branch=&Filter=P_COM'+AND+'a'='a"
| nc testbox 9002
echo -ne "POST /cgi-bin/koha/reports/borrowers_out.pl
HTTP/1.1\r\nHost: testbox:9002\r\nContent-Length:
183\r\n\r\nkoha_login_context=intranet&Limit=&Criteria=branchcode&output=file&basename=Export&MIME=CSV&sep=;&report_name=&do_it=1&userid=<userid>&password=<password>&branch=&Filter=P_COM'+AND+'a'='b"
| nc testbox 9002
====================================================================
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 4ead8eeeb010197ce48dd4b27f31bfe852684a25
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Apr 16 16:39:09 2015 +0200
Bug 10355: paramater 'object' lost on the road
Test plan:
1) Go to any detail page in staff
2) Click on the modification log tab
3) Verify, that the object is prefilled with the records biblionumber
and you can also see it as parameter in the url
4) Click a second time on modification log to reset your search
Before this patch, the object parameter was empty.
It now contains the value of the biblionumber.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Work as described, no koha-qa errors
http://bugs.koha-community.org/show_bug.cgi?id=10335
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 0002126a2ab0ac38a8d3f144f446dc3ba69dab59)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Conflicts:
tools/viewlog.pl
commit 81b8ce4fdda2340c9a95f9fe40a290d473840c0f
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Apr 24 17:03:09 2015 +0200
Bug 11790: Remove dependency C4::Context from C4::Charset
C4::Context is only used to retrieve a syspref value.
This patch moves the use of C4::Context to a require.
Test plan:
Try to reach the SetMarcUnicodeFlag subroutine (batchmod, add/update a biblio, etc.)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Tested on French UNIMARC install
No errors adding/editing biblios
No koha-qa errors
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 140d3fb95543c42c0cf630e2084038ebb25e5929
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jun 4 12:03:42 2015 +0200
Bug 14329: Useless copy/pasta from Template::Plugin::HtmlToText
The synopsis of this TT plugin contains two example lines:
[% myhtml FILTER html2text(leftmargin => 0, rightmargin => 0) %]
[% myhtmltext | html2text %]
These lines have been copied (without too much thought :) to a few templates. Since we do no use the variables myhtml or myhtmltext in these templates, these lines are useless.
Test plan:
[1] Put some items in your cart. And send it.
[2] Send a shelf.
[3] Git grep on myhtml. Should not have results.
NOTE: Sent carts and lists in Intranet and OPAC successfully.
Though, this does bring into question why the letters
have HTML formatting if it is getting removed. That,
however, is beyond the scope of this bug.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit a1c83e28bc8264fb579f0269b289226571e66281
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue May 26 14:52:07 2015 +0200
Bug 14276: Keep highlight on the active item in item editor
The highlight only works on even items.
This patch should resolve it.
Test plan:
Edit biblio with multiple items.
Verify that the highlight is visible on the selected item you edit.
And that there is no highlight for a new item.
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 6e06d103216488f86d1bbe215d391014f5b40f80
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Mon Jun 1 15:34:00 2015 -0300
Bug 14173: Paging on 'recent comments' page in OPAC is not displaying correctly
This patch corrects the display of current page on
a multipage recent comments.
To test:
1) Enable OpacShowRecentComments
2) Add multiple comments to multiple records
I used a script to add multiple lines like
"insert into reviews values ($i, 51, $i, 'Comment $i', 1, '2015-06-01 00:00:00')"
to table reviews
3) On OPAC, go to 'Recent comments', verify the bug
4) Apply the patch
5) Reload and check correct display
Can't found missing space near 'by' from description.
Display is correct for me.
Followed test plan, displays as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit f9503c2290aeb018bc294e74687d18605822a9ae
Author: Marc Véron <veron at veron.ch>
Date: Sun Apr 26 21:36:25 2015 +0200
Bug 11929: patron modification error shows borrowernumber
If an error occurs in patron batch modification, a message similar to the following is displayed:
Can not update patron with borrowernumber 7055
It would be useful to have the cardnumber as well.
This patch adds the card number to the lists of errors.
It is not easy to trigger an error (see comments).
For testing, I tweaked the sub ModMember in C4/Members.pm to always return false.
TEST PLAN
---------
1) Log in as a superlibrarian and create a test user
2) Change the cardnumber to a number differing from the
borrower number.
3) Home -> Tools -> Batch patron modification
4) Type in the cardnumber of that test user
5) Check the Library checkbox.
6) Click Save
-- nice error, but it is borrower number instead of
the card number which was entered.
7) Apply the patch
8) Repeat steps 3-6
-- nice error, but it is now more informative.
9) run koha qa test tools.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 3b3f82de377c87f9108bf07dd0d293182e5b9bdc)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 8a9184c4bc0de4866f7bdf7f945133d71c868f5b
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Tue May 26 13:05:51 2015 +0200
Bug 14266: Trim the email address in the pl script
The original concern of bug 14266 was to provide a compatibility for
<IE9.
But actually we don't need to trim the email address template side.
It will even better to trim it in the perl script, so that the email
will be trimed even if JS is disabled.
Test plan:
1/ Share a list and does not provide any email address
2/ Submit
=> The form is not submited, no alert/message is displayed (same as
before this patch).
3/ Share a list and provide an email address with spaces before and
after
4/ Submit
=> You should receive the email
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Test output compliant with expected test plan outcome.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 69a74bb8806ff78ef6a086bc71b831e15c5974bb
Author: David Cook <dcook at prosentient.com.au>
Date: Mon May 25 14:07:27 2015 +1000
Replace trim() with $.trim() in opac-shareshelf.tt
This patch replaces trim() with $.trim() which is supported
in versions of IE older than IE9.
Revised test plan
=================
Before applying patch:
0) Use IE 8 or Document Mode 8 in a newer IE using F12 Developer Tools
1) Set OpacAllowSharingPrivateLists to "Allow" in Global System Preferences
2) Create a private list in the OPAC
3) Add a record to the private list
4) Click "Share" or "Share list" on one of the list screens
5) Type in an email address and click "Send"
6) Note the error in the console log
7) The page should submit
Apply the patch:
7) Hold shift + refresh the browser to update any Javascript cache
8) Try to "Share" the list again
9) Note that the form submit after clicking "Send" and
that there are no errors in the console log
http://bugs.koha-community.org/show_bug.cgi?id=14266
Signed-off-by: Indranil Das Gupta <indradg at gmail.com>
Remarks: Works as per revised test plan
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 012b4bc5742859ee5a2edfe963056c4ee54897c4
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed May 20 11:31:18 2015 -0400
Bug 12066: New renew page in staff client doesn't record branch in statistics
Test Plan:
1) Apply this patch
2) Renew an item via circ/renew.pl
3) Note the branch code of your logged in library is set as the
branch in the generated statistic line
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Tested pre and post patch, now branch is saved
No errors
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 51c8e095fd0627b7551cdf0d602bdc21c83365cd
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon May 25 11:22:07 2015 +0200
Bug 13946: Change order status 'Pending' to 'Ordered'
The order status after closing the basket is 'ordered' in the
database, but displays as 'pending' in the staff interface.
As we use 'pending' when you have to review a suggestion, this
clashes in translations and the meaning is different. The patch
renames 'pending' for the order status to 'Ordered' to be more
clear.
To test:
- Verfiy 'Ordered' shows in the pull down on the acq advanced
search and search still works correctly
- Verify the results table also display 'Ordered' as the status
Signed-off-by: Cédric Vita <cedric.vita at dracenie.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 8161d1a5174f8fd63e0280cce1a750ad23a0e4f9
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Tue May 26 11:00:02 2015 -0300
Bug 14275: Remove CGI::scrolling_list from guided_reports.pl
Remove an instance of CGI::scrolling_list from this file
To test:
1) Go to Reports, Guided report wizard, New SQL report
2) Create a report with some auth value list, e.g.
SELECT surname,firstname FROM borrowers WHERE branchcode=<<Enter patrons library|branches>>
Save
3) Clic on 'Run this report", look at the dropdown, that will be changed
4) Apply the patch
5) Reload, check dropdown and any regression
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit d67f513eb37e3b6769d6897ed10c51ed9d2c2431
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri May 22 09:02:23 2015 -0400
Bug 14112 - Silence warnings in t/Charset.t
After Jonathan said this was the wrong way to correct the issue,
www.utf8-chartable.de made it clear to me that the \c3\a9 were
missing x's.
TEST PLAN
---------
1) prove t/Charset.t
-- noise
2) apply patch
3) prove t/Charset.t
-- no noise
4) koha qa test tools
Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 23de58d6e53a51276bdb8321f60efa1dfc93d643
Author: Indranil Das Gupta <indradg at gmail.com>
Date: Fri May 15 01:12:11 2015 +0530
Bug 14203 - Message for non-existent lang removal
A trivial string patch to update the error message displayed to
user if koha-translate is used to attempt removal of a language
that is not installed.
Test plan
=========
1/ attempt to remove a non-existent language by
<installdir>/debian/scripts/koha-translate --remove <langcode>
2/ it should show "Error: the selected language is not already
installed."
3/ apply patch
4/ repeat step 1; it should show "Error: the selected language is
not installed."
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit a2cdb740bd9106c19bb5fb9435ca6ca6f1f74704
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Tue May 12 02:08:17 2015 +0000
Bug 14184: Undefined $term causes noisy warns in C4/CourseReserves.pm
This patch sets $term to be an empty string.
Test plan
=========
1/ enable 'UseCourseReserves' syspref in Circulation preferences
2/ in a terminal, run a `tail -f ` on your instance's opac-error.log
3/ go to the opac, click on 'Course reserve' tab to go to
opac-course-reserves.pl
4/ notice the warning - "opac-course-reserves.pl: Use of uninitialized
value $term" appear in the `tail`ed opac-error.log
5/ apply the patch
6/ reload the page (opac-course-reserves.pl)
7/ page works but the warning in step #4 is no longer logged
8/ run qa test (i.e. koha-qa.pl -c 1 -v 2), there should be no error
Remarks: Testing result match expected test plan output. The QA tests
pass with "OK" for the commit.
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: Mason James <mtj at kohaaloha.com>
commit 5902d3ca6944d57256bbbcaf984509b8d282a4ea
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Tue May 12 03:01:35 2015 +0000
Bug 14185: Undefined $limit causes warn in opac/opac-readingrecord.pl
This patch sets $limit to be an empty string.
Test plan
=========
1/ login into the opac using your user account credentials
2/ in a terminal, run a `tail -f ` on your instance's opac-error.log
3/ go back to the opac, click on 'your reading history' tab to go to
opac-readingrecord.pl
4/ notice the warning - "opac-readingrecord.pl: Use of uninitialized
value $limit" appear in the `tail`ed opac-error.log
5/ apply the patch
6/ reload the page (opac-readingrecord.pl)
7/ page works but the warning in step #4 is no longer logged
8/ run qa test (i.e. koha-qa.pl -c 1 -v 2), there should be no error
Remarks: Testing result match expected test plan output. The QA tests
pass with "OK" for the commit.
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: Mason James <mtj at kohaaloha.com>
commit 0b96ac33da15bebd3728da01a9229e7f0fab0ec7
Author: Indranil Das Gupta <indradg at gmail.com>
Date: Thu May 14 07:23:16 2015 +0530
Bug 14186 [QA Followup]: Undefined $reservedfor causes warn in opac-reserve.pl
This is a followup for Bug 14186 that removes the extraneous tab
char on line 470, so that the patch can clear QA tools.
This patch sets $reservedfor to an empty string.
Test plan
=========
1/ in a terminal, run `tail -f ` on your instance's opac-error.log
2/ go to the opac and search from an item that exists on the Koha
instance.
3/ Select the title (if more than one title is returned) and click on
'Place hold' link to go to opac-reserve.pl
4/ notice the warning - "opac-reserve.pl: Use of uninitialized value
$reservedfor" appear in the `tail`ed opac-error.log
5/ apply the patch
6/ reload the page (opac-reserve.pl)
7/ page works but the warning in step #4 is no longer thrown up
8/ run qa test (i.e. koha-qa.pl -c 1 -v 2), there should be no error
Remarks: Testing result match expected test plan output. The QA tests
pass with "OK" for the commit.
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: Mason James <mtj at kohaaloha.com>
commit 5acd5c4a6ed9292be3faeda6f8e9beff3e299141
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Tue May 12 03:30:46 2015 +0000
Bug 14186: Undefined $reservedfor causes warn in opac-reserve.pl
This patch sets $reservedfor to an empty string.
Test plan
=========
1/ in a terminal, run `tail -f ` on your instance's opac-error.log
2/ go to the opac and search from an item that exists on the Koha
instance.
3/ Select the title (if more than one title is returned) and click on
'Place hold' link to go to opac-reserve.pl
4/ notice the warning - "opac-reserve.pl: Use of uninitialized value
$reservedfor" appear in the `tail`ed opac-error.log
5/ apply the patch
6/ reload the page (opac-reserve.pl)
7/ page works but the warning in step #4 is no longer thrown up
8/ run qa test (i.e. koha-qa.pl -c 1 -v 2), there should be no error
Remarks: The QA test failed - "forbidden pattern: tab char (line 470)".
Marking this as 'FAILED QA'
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 148249423a1a88db52d0ba9d2fbb508a16869caf
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon May 4 22:08:04 2015 +0200
Bug 14130: Update columns.def
- Updates columns.def with new columns in items
- Adds some descriptions
- Corrects some existing column descrpitions
To test:
- Read the patch to see what has been changed
- Run the guided report builder for the 'circulation'
module
- Observe changes show up
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Changes show up, no errors
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Mason James <mtj at kohaaloha.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Charset.pm | 2 +-
C4/CourseReserves.pm | 1 +
C4/Installer/PerlDependencies.pm | 2 +-
C4/SMS.pm | 4 +-
Koha/Plugins/Base.pm | 3 +-
Koha/QueryParser/Driver/PQF/Util.pm | 5 +-
Koha/Template/Plugin/Koha.pm | 3 +-
acqui/updatesupplier.pl | 11 +--
admin/branches.pl | 2 +-
admin/systempreferences.pl | 6 +-
circ/circulation.pl | 4 +-
circ/renew.pl | 3 +-
circ/transferstoreceive.pl | 2 +-
debian/scripts/koha-translate | 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 +-
installer/data/mysql/updatedatabase.pl | 2 +-
koha-tmpl/intranet-tmpl/prog/en/columns.def | 14 ++--
.../prog/en/includes/biblio-view-menu.inc | 2 +-
.../intranet-tmpl/prog/en/js/pages/preferences.js | 2 +-
.../prog/en/modules/acqui/histsearch.tt | 6 +-
.../prog/en/modules/admin/preferences/admin.pref | 2 +-
.../prog/en/modules/admin/systempreferences.tt | 2 +-
.../prog/en/modules/basket/sendbasket.tt | 2 -
.../prog/en/modules/catalogue/issuehistory.tt | 26 +++++---
.../prog/en/modules/cataloguing/addbooks.tt | 8 ++-
.../prog/en/modules/cataloguing/additem.tt | 11 +--
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 1 +
.../prog/en/modules/circ/transferstoreceive.tt | 13 ++--
.../prog/en/modules/members/moremember.tt | 2 +-
.../prog/en/modules/members/readingrec.tt | 4 +-
.../en/modules/reports/guided_reports_start.tt | 8 ++-
.../prog/en/modules/tools/modborrowers.tt | 7 +-
.../prog/en/modules/tools/tools-home.tt | 11 ++-
.../prog/en/modules/virtualshelves/sendshelf.tt | 2 -
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 1 -
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 6 +-
.../bootstrap/en/modules/opac-sendbasket.tt | 2 -
.../bootstrap/en/modules/opac-sendshelf.tt | 2 -
.../bootstrap/en/modules/opac-shareshelf.tt | 17 ++++-
.../bootstrap/en/modules/opac-showreviews.tt | 2 +-
.../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 2 +-
members/moremember.pl | 3 +-
opac/opac-detail.pl | 31 +++++----
opac/opac-ratings.pl | 23 ++-----
opac/opac-readingrecord.pl | 1 +
opac/opac-reserve.pl | 1 +
opac/opac-shareshelf.pl | 6 ++
patroncards/edit-layout.pl | 7 ++
reports/borrowers_out.pl | 41 +++++++-----
reports/guided_reports.pl | 17 ++---
t/Charset.t | 4 +-
t/Creators.t | 11 +--
t/QueryParser.t | 70 ++++++++++++++++----
tools/inventory.pl | 4 +-
tools/modborrowers.pl | 6 +-
tools/picture-upload.pl | 2 +-
tools/quotes/quotes-upload_ajax.pl | 16 ++---
tools/quotes/quotes_ajax.pl | 16 ++---
tools/viewlog.pl | 1 +
69 files changed, 289 insertions(+), 212 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list