[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.07-88-g2b05125
Git repo owner
gitmaster at git.koha-community.org
Tue Dec 17 19:49:43 CET 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, 3.12.x has been updated
via 2b05125808e25cd683afda15c7709fa9b764a308 (commit)
via 3d76f98dc43b2c613cd5279fb1ee082a6383309f (commit)
via 6e9dbec3c9c2cd851c77b25b6ced190b2bbbea6d (commit)
via c1f8e2757ddffd98d1ae34d011e5f0c97bcbb9e2 (commit)
via 57757250d6f1c02ffd212052bac5459a76f8625c (commit)
via efe589d54a5ca3f5e7321f1a49e458f6a76d8e82 (commit)
via 0b25d8254b8d9a4c915076fa693194046842442e (commit)
via 7e4f2dfefba244120d6d094a7b27b8d4463068f4 (commit)
via ca0a711661595fdb6b133ac305eb87b2f49a93ae (commit)
via 1a2b32c848bfe425cdc0352315d13e0d5b1c8d9d (commit)
via 4da90d28808f2eee38da43f6feb0583dfff6b7f4 (commit)
via 573b474246aa654b507d8383f0a238236ff58873 (commit)
via 4f20aa264011cb6e55cfa2e6607656c65581bca7 (commit)
via 208d4c6a74a1cc5fe89d4990eaba39c1851b8208 (commit)
via 2106c5b47f19d4ebbe572f991aac8826d61ce047 (commit)
via fc22351ccab119272ce149da7dbad15487071425 (commit)
from 243f820d2597597d87a722ec00f39cacb8929e0e (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 2b05125808e25cd683afda15c7709fa9b764a308
Author: Srdjan <srdjan at catalyst.net.nz>
Date: Fri Nov 1 21:42:45 2013 +1300
Bug 11077: Correct more warnings in C4/Auth.pm
This gets rid of some more warnings.
It also corrects a noisy ne condition.
$userid = $retuserid if ( $retuserid ne '');
became
$userid = $retuserid if ( $retuserid );
It also integrates Srdjan Jankovic's patch with Petter Goksoyrsen's
patch, while correcting the problems found.
This includes:
my $q_userid = $query->param('userid') // '';
along with:
my $s_userid = '';
and:
my $s_userid = $session->param('id') // '';
Indentation does not reflect actual scoping.
A missing system preference would have triggered a ubiquitous
undef compare check failure message. This makes the flooding
message more useful, so as to help correct it.
The change to accomplish this was:
my $pki_field = C4::Context->preference('AllowPKIAuth');
if (!defined($pki_field)) {
print STDERR "Error: Missing AllowPKIAuth System Preference!\n";
$pki_field = 'None';
}
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit a0b00e4c8bd75a0557e487520fff5e2e39e10803)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
(cherry picked from commit cd394cda1efd7b34dc86d1da42193e4b609aeea4)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 3d76f98dc43b2c613cd5279fb1ee082a6383309f
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Thu Oct 17 17:41:43 2013 -0700
Bug 11077: remove uninitialized value $pki_field warning
During login at the Staff interface you get warnings in the logs
regarding an uninitialized value for the $pki_field variable.
To test:
- tail -f /path/to/your-intranet-logs
- Point your browser to your staff login page
- Login
- Three warnings are showed
- Apply the patch
- Log out
- Log in
- No new warnings, and you can still log in.
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Petter Goksoyr Asen <boutrosboutrosboutros at gmail.com>
Followed test plan; it works as advertised.
Also works when I deleted AllowPKIAuth system pref.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit ce5ab3b31457793815a2f49bc8287fdcbd0dd3c5)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
(cherry picked from commit 8c7153df0fc99167dc701772f6ede6c90227e4d4)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 6e9dbec3c9c2cd851c77b25b6ced190b2bbbea6d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Thu Dec 5 10:09:20 2013 +1300
Bug 11341: fix XSS bug in opac-search.pl (facets)
This patch fixes the prog theme; the bootstrap theme already
does the necessary filtering.
To test
1/ Craft a url like
cgi-bin/koha/opac-search.pl?idx=kw&q=fish&offset=20" onmouseover%3dprompt(994000) bad%3d"
(the search must return enough results to have a show more link in the facets)
2/ Check the source, or mouseover the Show more links in the facets
Notice the code is executable
3/ Apply patch - notice it is no longer executable
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit d2d365ca830345b9a519158f6d735d2abd125380)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
(cherry picked from commit d0ba676864eb2a55776d8dbd02d2403f9fa74a4b)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit c1f8e2757ddffd98d1ae34d011e5f0c97bcbb9e2
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Dec 3 12:01:23 2013 +1300
Bug 11322: rscrub bad data before storing suggestions in the DB
1/ In the public interface, add a suggestion containing html
2/ Save, notice the html is rendered (or if you have the other patches
is displayed)
3/ Apply this paget
4/ Add another suggestion
5/ Notice the html is stripped
Signed-off-by: David Cook <dcook at prosentient.com.au>
Works as described.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 48b339980e20bdefb21141d537c283d15e267d93)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
(cherry picked from commit a907c28a1e408cc73ab0437d90dca8c861ae08f5)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 57757250d6f1c02ffd212052bac5459a76f8625c
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Dec 3 11:46:24 2013 +1300
Bug 11322: fix XSS bug in purchase suggestions - OPAC
1/ Add a suggestion in the opac, with lots of html
2/ View that suggestion in the OPAC, note the html is rendering
3/ Apply the patch
4/ Test again, in prog and bootstrap, no more rendered html
Signed-off-by: David Cook <dcook at prosentient.com.au>
Works as described.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 90f3b84def924dcc76719c01d75aa09241c92f8e)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
(cherry picked from commit 3eac4854a4309612c4bdd33eed5fbcb77d59d5ad)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit efe589d54a5ca3f5e7321f1a49e458f6a76d8e82
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Dec 3 11:34:48 2013 +1300
Bug 11322: fix XSS bug in purchase suggestions pages
To test
1/ Switch on purchase suggestions
2/ On the public interface (OPAC) add a suggestion, put html in every
field
3/ In the staff interface go to the suggestions page
/cgi-bin/koha/suggestion/suggestion.pl
4/ Notice the html is rendered
5/ Click on a suggestion, notice the html is rendered on the show page
also
6/ Apply the patch, check these two pages again, html should now be
escaped
Signed-off-by: David Cook <dcook at prosentient.com.au>
Works as described.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests, thx Chris!
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 368068c71597eaf61e4f9cc154002ea92dfd16c3)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
(cherry picked from commit f8278987e3e1bac23e968417728a821faa22aa57)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 0b25d8254b8d9a4c915076fa693194046842442e
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Tue Nov 12 17:19:09 2013 +0100
Bug 11059: (follow-up) restore time in staged dates in addorderiso2709.tt
Follow-up patch to restore the display of time in
acqui/addorderiso2709.tt in staged date.
Simply uses an option of KohaDates TT plugin.
This time may be useful if there where several imports in the same day.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit cfa0dc1aedf3a280f98b9a1728853a6041f59af5)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
(cherry picked from commit b40abcb16593fdb23c54b942e3a152ccbdf1c3ff)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 7e4f2dfefba244120d6d094a7b27b8d4463068f4
Author: Lyon3 Team <koha at univ-lyon3.fr>
Date: Tue Nov 12 15:32:34 2013 -0400
Bug 11059: fix date sorting of import batches in basket add form
This patch improves the sorting of staged import batches by date,
particularly when the dateformat system preference is set to anything
other than YYYY-MM-DD.
Adds title-string sorting type to enable this.
To test:
[1] Ensure that there are at least three staged
bib import batches, with upload timestamps such that
date sorting errors would be apparent.
[2] Set the dateformat system preference to either DD/MM/YYYY
or MM/DD/YYYY.
[3] Create a new basket in acquisitions, then chose to add
a new order line from a staged record batch.
[4] In the list of batches, click on the 'staged' column
heading to sort by date.
[5] Observe that dates are sorted in alphanumeric order, not date
order.
[6] Apply the patch and refresh. This time, dates should sort
correctly.
Signed-off-by: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 097a92b3188d62e9797d18313715c35d9dc186b4)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
(cherry picked from commit 2ffdd4c341c3bb175134eca06db0e204d46988af)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit ca0a711661595fdb6b133ac305eb87b2f49a93ae
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Nov 13 15:55:24 2013 -0500
Bug 11242: fix opac-MARCdetail.pl display and warnings
This patch improves the public catalog MARC view display
of records that contain subfields that are not defined in
the framework used by the bib record.
To test:
(RM note: it may be easier to find or create a MARC record that
contains a subfield not present in the default framework, then
load it, rather than fiddle with the MARC frameworks in your
test database.)
BACK UP YOUR DATABASE!
1) Search for an item in OPAC
2) Open OPAC detail
3) Click 'MARC View' link
4) Look for something with multiple lines (e.g. 260 or 942)
5) In another tab, Go to staff client and log in
6) Go to the staff client URL similar to:
/cgi-bin/koha/catalogue/detail.pl?biblionumber=##### page
where ##### is the biblionumber.
7) Edit -> record
8) Note the framework used.
9) More -> Administration
10) MARC bibliographic frameworks
11) Click 'MARC structure' for the framework used by the item
shown in OPAC.
12) Find the tag (e.g. 260 or 942) and click 'Subfields'
13) Delete of the matching subfields (e.g. 260$b) shown in the
OPAC tab
14) Clear your opac error log.
15) Refresh OPAC tab. The tag subfields are split.
16) There are opac-MARCdetail.pl warnings.
17) Apply patch
18) Clear your opac error log.
19) Refresh OPAC tab. The tag subfields are no longer split strangely.
20) There are no opac-MARCdetail.pl warnings.
RESTORE YOUR DATABASE.
This also silences a series of warnings triggered by catching
undef hash references.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 38503e18a38116646c9746b13f013b3c11fe55c1)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
(cherry picked from commit e8d988cc036a0633e19cf0843aa6daa7fddcedd1)
commit 1a2b32c848bfe425cdc0352315d13e0d5b1c8d9d
Author: Srdjan <srdjan at catalyst.net.nz>
Date: Fri Nov 1 21:05:09 2013 +1300
Bug 11183: get rid of some log noise from the OPAC
To test in OPAC:
* With the OPAC System Preference EnableOpacSearchHistory set
to Keep, a simple search triggers the warning patched on
line 626 of opac-search.pl
* Selecting a search result item with no Collection Code
set triggers the warning patched on line 576 of opac-detail.pl
* Have an item with Collection Code. Check that the Collection
Code shows.
* Collection Code is set by editing an item in the staff client
(952$8)
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit ec206d18980b2438cfe3da9e89455eda319dd8d7)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
(cherry picked from commit dc919cac9c62111ab38a6f1bdb7abfb9a38ee8c5)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 4da90d28808f2eee38da43f6feb0583dfff6b7f4
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Wed Jul 17 17:26:34 2013 +0200
Bug 7484: keep selected values when changing search type on authority search form
1) I'm on the "Search authorities" tab. I select an authority type,
then change the active tab. The type change is lost.
2) I'm on a tab and type a search pattern, then change tab, the string
is lost.
This behaviour is logical, given the fact that we're using tabs, but it
would be more practical to keep the typed informations when the user
changes the search mode.
This patch add a few JQuery code to synchronise inputs between all
tabbed authorities search forms.
Test plan :
- Go to Authorities home page : cgi-bin/koha/authorities/authorities-home.pl
- In toolbar, "Search main heading" is selected
- Change all inputs : authotity type, operator, term, and sort order
- Click on "Search all headings" tab
=> Inputs are the same has previous tab
- Click on "Keyword search" tab
=> Inputs are the same has previous tab
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Amended patch: Explicitly declare 2 new variables used.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script.
Works as described, Firebug doesn't show any problems with
the Javascript.
Could be useful for other tabbed searches like the start page
as well.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 85642ededaf71b0a67805151937014f42deea2dd)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
(cherry picked from commit 32277e0669c86c972117bd62b92bbad2dab4e5c5)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 573b474246aa654b507d8383f0a238236ff58873
Author: Rachel Dustin <r.dustin at massey.ac.nz>
Date: Wed Nov 13 16:40:23 2013 +1300
Bug 11105: wrap places OPAC facet in a span
prog-only OPAC patch.
To test:
Verify places in the facets is wrapped in a span.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Template change only, works as expected.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit a9900b0d35bcd27483355f19985a9669e1c884e2)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
(cherry picked from commit 98efa9bcc1048474176d04443eb6d6f9338c52b1)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 4f20aa264011cb6e55cfa2e6607656c65581bca7
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Tue Dec 17 12:30:24 2013 -0300
DBRev 3.12.07.001
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 208d4c6a74a1cc5fe89d4990eaba39c1851b8208
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Wed Nov 20 14:34:36 2013 +0100
Bug 11275: make deleteditems.materials be of type text
Bug 7278 has made items.materials of type text.
It must be the same in deleteditems column.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script.
Tested:
- definition of materials now matches between items and deleteditems
- database update works correctly
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
The only difference between tables items and deleteditems is
deleteditems.marc
Amended patch: Add a missing SetVersion in updatedb.pl
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 8aa6e51b6f684f98077dd1c3df1f847bef8d40ba)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
(cherry picked from commit e312ac25eae6b436c5ad71a2493520b5b5600564)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 2106c5b47f19d4ebbe572f991aac8826d61ce047
Author: Sophie Meynieux <sophie.meynieux at biblibre.com>
Date: Wed Oct 23 18:00:29 2013 +0200
Bug 11125: Correct display for patron messaging preferences on OPAC
To test :
1) Remove 'sms' from message_transport_types table
2) Go on OPAC "My messaging" tab => table columns are out of alignment with table heading
3) Apply patch => table is correctly displaid
Signed-off-by: Koha team AMU <koha.aixmarseille at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 7021d36d0e58fe2acd0ae4ee7c9e658df2cc74be)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
(cherry picked from commit 3e19537355c22b32cb6f3fda08ec64a5c04f4251)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit fc22351ccab119272ce149da7dbad15487071425
Author: Zeno Tajoli <z.tajoli at cineca.it>
Date: Fri Nov 8 17:10:08 2013 +0000
Bug 11222: fix crash that can occur in search for items to add to label batch
This patch fixes a regression on label-item-search.pl introduced by
the patch for bug 9239 where searching for items to add to a label
batch fails with an error if QueryParser is not enabled and you use
the "Added on or before date" search option.
Test plan:
0) Set "UseQueryParser" to "do not try"
1) Start with an installation with bibliografic data and items
information.
2) Check that in items there are values inside Accession Date
Without the patch:
a) Go in Home› Tools› Labels and click on 'New batch'
b) Click on 'Add Item(s)'
c) Try to select items with option "Added on or before date"
d) You will receive an error
With the patch:
Try steps a),b), and c)
Now you don't receive an error and you can select items
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Added a description of the problem and copied the test plan from the bug
report, with the addition of the information that QueryParser must be
off to confirm and test.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 69c42067ced1da3821e8a893c76c2f1f1195f946)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
(cherry picked from commit 8a6215c8c789c4c3044d08ab83f3353cd857a055)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Followed the test plan and the patch fixed the issue.
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 26 +++++---
acqui/addorderiso2709.pl | 4 +-
installer/data/mysql/kohastructure.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 7 +++
.../prog/en/includes/authorities-search.inc | 5 ++
.../prog/en/modules/acqui/addorderiso2709.tt | 8 ++-
.../prog/en/modules/suggestion/suggestion.tt | 20 +++----
.../opac-tmpl/prog/en/includes/opac-facets.inc | 4 +-
.../opac-tmpl/prog/en/modules/opac-messaging.tt | 2 -
.../opac-tmpl/prog/en/modules/opac-suggestions.tt | 14 ++---
kohaversion.pl | 2 +-
labels/label-item-search.pl | 2 +-
opac/opac-MARCdetail.pl | 62 ++++++++++++--------
opac/opac-detail.pl | 2 +-
opac/opac-search.pl | 2 +-
opac/opac-suggestions.pl | 6 ++
16 files changed, 102 insertions(+), 66 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list