[koha-commits] main Koha release repository branch master updated. v3.20.00-621-gd222e6e
Git repo owner
gitmaster at git.koha-community.org
Fri Sep 25 16:52:18 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, master has been updated
via d222e6ec21c5d2aea03d839cd82050ca6437f0d4 (commit)
via 5d46dbf3e938fbc80436a263cdc417cd798e0ab4 (commit)
via 07bad6b3faea8cce9618ca2fa07937925740b30c (commit)
via c43b7b63a7d5e8bdb05fa945633af23666d6cfee (commit)
via 66d2ded1d2bb68680a799fc6f4e8359623071e2f (commit)
via bd021d21035fa25f1732946e0f0a291400ee1c56 (commit)
via 8ef69e473b1f1a0daac559bf19818fd04b2c5313 (commit)
via 37ad2d78679fc8487811ff9cd1679eecac30faa5 (commit)
via e16367f0a8a955c6beac0b165e884be096117db1 (commit)
via e131df30a0b939fbec1b89c76eff2d3d84962bd3 (commit)
via a888b372f961aee377e8ef037cc249b8e6e523dc (commit)
via 8548c6acf962129ef48caa0417aabf3787f9416a (commit)
via 995e27b3737dc29f478adad0033c4cc3fa593ec3 (commit)
via 0893a7c3dbacd9887f0c196589f1c529e497fcd5 (commit)
via f1c9b314bb6c3d20dabbe45880766a63b8c8a7a7 (commit)
via 1291dfe5cf5b4c945ac8ae383814a5145fb1904d (commit)
from 1e93bd3a94ddb94f0d2ed2dee2e5dee6b73ad808 (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 d222e6ec21c5d2aea03d839cd82050ca6437f0d4
Author: Joonas Kylmälä <j.kylmala at gmail.com>
Date: Thu Aug 20 09:24:17 2015 +0000
Bug 14505: single quotes in journal number cause print routing list window to not appear
Escapes single quotes from serial.serialseq string.
Test plan:
1. Have a serial with a number which has single quote in it.
2. Go to Serials -> Find some serial subscription -> Serial collection.
3. Set up a routing list for this serial.
4. Click on Print list under the column Routing.
5. Notice that the print window doesn't open.
6. Apply patch.
7. Notice that the print window opens.
Sponsored-by: Vaara-kirjastot
Followed test plan. Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 5d46dbf3e938fbc80436a263cdc417cd798e0ab4
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Jul 8 12:37:31 2015 -0300
Bug 14217: Add 'condition' attribute for DOM index definition
This patch introduces an extension to the current syntax for DOM index definition.
Specifically, it extends the 'index_subfields' tag to allow adding a 'condition'
attribute that is used as a condition ofr applying the specified index.
This (exotic) example is self-explanatory:
The previous syntax (which is keeped by this patch) took this snippet from biblio-koha-indexdefs.xml
<index_subfields tag="100" subfields="acbd">
<target_index>Encuadernador:w</target_index>
</index_subfields>
and generated an XSLT snippet in the DOM indexing XSLT that looks like this:
<xslo:for-each select="marc:subfield">
<xslo:if test="contains('acbd', @code)">
<z:index name="Encuadernador:w">
<xslo:value-of select="."/>
</z:index>
</xslo:if>
</xslo:for-each>
This patch introduces this syntax change (note the 'condition' attribute:
<index_subfields tag="100" subfields="acbd" condition="@ind2='7'">
<target_index>Encuadernador:w</target_index>
</index_subfields>
which yields to this XSLT snippet in the DOM indexing XSLT:
<xslo:if test="@ind2='7'">
<xslo:for-each select="marc:subfield">
<xslo:if test="contains('acbd', @code)">
<z:index name="Encuadernador:w">
<xslo:value-of select="."/>
</z:index>
</xslo:if>
</xslo:for-each>
</xslo:if>
To test:
- Verify that the shipped XSLT files are current regarding the shipped index definitions:
$ for i in marc21 normarc unimarc; do
xsltproc etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl \
etc/zebradb/marc_defs/$i/biblios/biblio-koha-indexdefs.xml \
> etc/zebradb/marc_defs/$i/biblios/biblio-zebra-indexdefs.xsl
done
$ git status
(repeat for authorities, skip normarc which doesn't have authorities)
- Apply the patch
- Re-run the previous commands
=> SUCCESS: no changes
- Add a condition to an index_subfields tag (for example, condition="@ind2='7'" in the Author's index
- Regenerate the specific XSLT
=> SUCCESS: doing a diff shows the only change is the code has been wrapped inside an xslo:if using the condition for the test
- Apply the generated xsl to a MARCXML record that has a field matching the condition like this:
$ xsltproc .../biblio-zebra-indexdefs.xsl sample_record.xml
=> SUCCESS: There's an index on the result, containing the configured field/subfields, that matches the criteria.
- Sign off and feel really happy :-D
Note: the attached sample record includes a 100 field, with ind2=7 and $a=Tomasito
Edit: This patch was squashed once I figured it got too complex and Jonathan required a followup
to avoid code duplication.
This avoids code duplication, with the same results.
Sponsored-by: Orex Digital
Signed-off-by: Barton Chittenden <barton at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 07bad6b3faea8cce9618ca2fa07937925740b30c
Author: Marc Véron <veron at veron.ch>
Date: Sun Sep 20 21:39:44 2015 +0200
Bug 14873: Remove C4::Dates from reserve/request.pl
This bug removes deprecated C4::Dates from reserve/request.pl
To test:
- Apply patch
- In staff client, search a biblio and try to put a hold for a borrower (Home > Catalog > [Some Biblio] > Place a hold to [Some biblio])
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit c43b7b63a7d5e8bdb05fa945633af23666d6cfee
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Sep 24 11:28:42 2015 +0100
Bug 14879: Move the date displays to the template
There is no special need to format the date in the perl script.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 66d2ded1d2bb68680a799fc6f4e8359623071e2f
Author: Marc Véron <veron at veron.ch>
Date: Sun Sep 20 23:36:32 2015 +0200
Bug 14879: Remove C4::Dates from catalogue/detail.pl
This bug removes deprecated C4::Dates from catalogue/detail.pl
To test:
Apply patch
Go to Home > Catalog > Details for [some biblio with items and holdings]
Make sure that biblio and Holdings and Acquisition details display as appropriate
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Bug 14879 - Remove C4::Dates from catalogue/detail.pl
Remove forbidden patterns (tab) to pass QA tools
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit bd021d21035fa25f1732946e0f0a291400ee1c56
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Sep 25 11:47:23 2015 -0300
Bug 14733: (QA followup) make tests independent of already defined branches
The current tests were expecting the first defined branch to be CPL. That's
not the case on my box so they failed. This patch adds the creation of two
new random branches/branchcodes, and replaces the legacy use of CPL and MPL
in favour of the new ones.
It relies on TestBuilder for the task.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 8ef69e473b1f1a0daac559bf19818fd04b2c5313
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Sep 21 16:46:00 2015 +0100
Bug 14733: Replace 'priority' with 'estimated priority'
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 37ad2d78679fc8487811ff9cd1679eecac30faa5
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Aug 26 11:43:08 2015 -0400
Bug 14733: Prevent a record from having holds with duplicate priorities
It is possible to create holds with duplicate priorities.
The reason for this is that typically the priority is calculated before
placing the hold. When the hold is placed the priority is calculated.
This can easily be shown by opening up two browser windows and starting
to place a hold for a record in each one. You'll see that both list the
same priority. If you than place the hold in each window, both holds
will have the same priority!
Test Plan:
1) Run unit tests pre-patch, note they fail
2) Run unit tests post-patch, note they succeed
Signed-off-by: Heather Braum <hbraum at nekls.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit e16367f0a8a955c6beac0b165e884be096117db1
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Aug 26 11:42:14 2015 -0400
Bug 14733: Unit Tests
Signed-off-by: Heather Braum <hbraum at nekls.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit e131df30a0b939fbec1b89c76eff2d3d84962bd3
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Sep 25 11:20:13 2015 -0300
Bug 14298: DBRev 3.21.00.027
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit a888b372f961aee377e8ef037cc249b8e6e523dc
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Sep 14 10:50:12 2015 +0100
Bug 14298: Add perms for other languages
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 8548c6acf962129ef48caa0417aabf3787f9416a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 2 16:30:15 2015 +0100
Bug 14298: Add warning to the about page if the sco user does not have correct permissions
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Note: Made a little change, changed He should have, to They should have
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 995e27b3737dc29f478adad0033c4cc3fa593ec3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 2 16:10:45 2015 +0100
Bug 14298: Use the new permission in the sco scripts
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Note without this patch, you won't be able to access the SCO side.
So don't panic if you cant use SCO with just the first patch
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 0893a7c3dbacd9887f0c196589f1c529e497fcd5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 2 16:09:35 2015 +0100
Bug 14298: Add the new 'self_checkout' permissions
There is a security issue in the self checkout module.
The user used to check items out must have the circulate =>
circulate_remaining_permissions permissions.
So even if a user does not have a login/password or a barcode he cans
access to the circulation module of the intranet.
Imagine if the sco patron used is a superlibrarian...
This patch set will change the behavior and adds a new permission to
access to the sco module (circulate => self_checkout).
This permission should be the only one defined for this patron.
IMPORTANT NOTE: Hopefully, this only works if both interfaces use the
same domains (but different ports).
Test plan:
0/ Does not apply this patch set
1/ Create a patron with the circulate => circulate_remaining_permissions
and some others. Note his userid/pwd (later 'sco/sco').
Turn on WebBasedSelfCheck and AutoSelfCheckAllowed
Fill the AutoSelfCheckID and AutoSelfCheckPass wich 'sco' and 'sco'
2/ Log you out from the OPAC and the intranet
3/ Go on the sco page
4/ Note that your are automatically logged in
5/ Go on the circulation module on the intranet side
6/ Oops
7/ Apply this patch
8/ Execute the updatedatabase
9/ Note that the sco user only has the new permission circulate =>
self_checkout, others have been removed
10/ Try to reproduce the issue, it should not access anything on the
intranet side
11/ Confirm that there is no regression in the sco module
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Works well no regressions, changes the permissions appropriately.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit f1c9b314bb6c3d20dabbe45880766a63b8c8a7a7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 16 09:24:07 2015 +0100
Bug 14817: (follow-up) Fix encoding issues in columns.def
Follow-up for reports.
Test plan:
1/ Use a translated template (fr-FR or ar-Arab)
2/ Go on the report guided page, step 3
3/ The field names should be correctly encoded.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 1291dfe5cf5b4c945ac8ae383814a5145fb1904d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Sep 14 15:02:50 2015 +0100
Bug 14817: Fix encoding issues in columns.def
Test plan:
1/ Use a translated template (fr-FR or ar-Arab)
2/ Go on the tools/import_patrons.pl page
3/ The field names in the "default values" block should be correctly
encoded.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
-----------------------------------------------------------------------
Summary of changes:
C4/Reports/Guided.pm | 2 +-
C4/Reserves.pm | 2 +
C4/Templates.pm | 2 +-
Koha.pm | 2 +-
about.pl | 28 +++++++
catalogue/detail.pl | 8 +-
etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl | 71 ++++++++++-------
.../data/mysql/de-DE/mandatory/userpermissions.sql | 1 +
.../data/mysql/en/mandatory/userpermissions.sql | 1 +
.../data/mysql/es-ES/mandatory/userpermissions.sql | 1 +
.../mysql/fr-FR/1-Obligatoire/userpermissions.sql | 1 +
.../data/mysql/it-IT/necessari/userpermissions.sql | 1 +
.../mysql/nb-NO/1-Obligatorisk/userpermissions.sql | 1 +
.../data/mysql/pl-PL/mandatory/userpermissions.sql | 1 +
.../ru-RU/mandatory/permissions_and_user_flags.sql | 1 +
.../uk-UA/mandatory/permissions_and_user_flags.sql | 1 +
installer/data/mysql/updatedatabase.pl | 28 +++++++
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 14 +++-
.../prog/en/modules/catalogue/detail.tt | 6 +-
.../prog/en/modules/reserve/request.tt | 2 +-
.../prog/en/modules/serials/serials-collection.tt | 2 +-
opac/sco/help.pl | 2 +-
opac/sco/sco-main.pl | 3 +-
opac/sco/sco-patron-image.pl | 2 +-
reserve/request.pl | 12 +--
t/db_dependent/Holds.t | 80 +++++++++++---------
26 files changed, 186 insertions(+), 89 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list