[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.10-37-g16fb453
Git repo owner
gitmaster at git.koha-community.org
Sat Sep 14 20:33:35 CEST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, 3.10.x has been updated
via 16fb453b37806299a40a75fe8f50e6cb8d456abe (commit)
via 1afbc53d88f0254376dd38ef3757ca366c16e7a6 (commit)
via ae996b8ae3413b031a7a7f9f061ab25c42702480 (commit)
via 2e3d1f0ed77e6cbcabd171db9a96e4e49849f820 (commit)
via 645945a339f9a01a31a08bc8c14e4c31a289234d (commit)
via 056c2feeaea534c1d1ba0556f5b4464d7da84dee (commit)
via 0de04775a63a4fae6ab5773a4db57a0424567881 (commit)
via 9adf171458d754063a34a433b5d6de2052e55bff (commit)
via 60b679fa22a4fca5a54c4e25183d1cb425afded0 (commit)
via 1374b9ecb527303d0f9d4de9b60e85f37904df2f (commit)
via 35ef2d36845933336b65e32e4fb9e944529339af (commit)
via 34e37dca5b101567adbbb3b2fbd4b66eb49b48ba (commit)
via f7c12eb41c044a6c55478cf3d83e9d2573ead463 (commit)
from e838b37cfa9229ef20f769dab083918d9d362b1b (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 16fb453b37806299a40a75fe8f50e6cb8d456abe
Author: David Cook <dcook at prosentient.com.au>
Date: Tue Aug 13 12:16:28 2013 +1000
Bug 10715 - MARC21 007 Plugin Editor doesn't load position 01
This patch changes the MARC21 007 plugin editor so that it uses
1 character instead of 4 characters for position 01.
TEST PLAN:
1) Create new record/edit an existing record
2) Using the tag editor for the 007 field, choose "Videorecording"
3) Click OK
4) Change the second character in the 007 from "c" to "d"
5) Open the tag editor again
6) Note that position 01 will still say "c - Videocartridge" rather
than "d - Videodisc".
7) Exit tag editor
8) Apply patch
9) Reload the page (Shift + Refresh is always useful)
10) Open the tag editor again
11) Note that position 01 will now say "d - Videodisc"
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 73ac970f734b0f04fff5561aa35bb9d9d47aa943)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Fix worked as expected.
(cherry picked from commit 8a407d8d02463cd15423735dc6030da2c8f5e3a7)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 8a407d8d02463cd15423735dc6030da2c8f5e3a7)
commit 1afbc53d88f0254376dd38ef3757ca366c16e7a6
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Mon Jun 17 17:01:33 2013 +0200
Bug 10483: fix item uniqueness check on order form
When syspref "UniqueItemFields" is defined, the item uniqueness is
tested in acquisition by an AJAX call to check_uniqueness.pl. This
patch fixes an issue where check_uniqueness.pl wasn't looking
at the correct CGI parameters.
Test plan :
- Select an existing item with barcode
- Add "barcode" to "UniqueItemFields" syspref (use space as separator
for multiple values)
- Set "AcqCreateItem" syspref to "Create an item when placing an order"
- Go to an acquisition basket
- Create a new order from empty
- Enter existing barcode in item form and save
=> You get an alert that barcode already exists and order is not saved
- Enter a non-existing barcode in item form and save
=> Order and item are created
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 1c9135262b9233f59fd05e34c90980e7dc8be338)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit df428a49e5c8b9106771d308bd1c1dea62d64429)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit df428a49e5c8b9106771d308bd1c1dea62d64429)
commit ae996b8ae3413b031a7a7f9f061ab25c42702480
Author: Janusz Kaczmarek <januszop at gmail.com>
Date: Mon Apr 22 20:28:08 2013 +0300
Bug 5262: make authority plugin copy indicators to bib record
With this patch Koha should correctly copy indicators
(and create $2 subfield in MARC 21 if need) from the chosen authority
record to the edited bibliographic record (according to discussion in
bugzilla). UNIMARC and MARC 21 flavors are covered.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Comment: work as described, testing in comments 9 and 12.
No errors.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes QA script and tests. Tested functionality repeating
some of the tests noted by Bernardo - checking mostly 1xx, 490,
and 7xx.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 129c974fdde0dc62e568f7aa01c4a0796ae150ae)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 2f4839c3ff22edab560b15e6bafa1a308a32c6a6)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 2f4839c3ff22edab560b15e6bafa1a308a32c6a6)
commit 2e3d1f0ed77e6cbcabd171db9a96e4e49849f820
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Jul 22 08:32:39 2013 -0400
Bug 10511: (follow-up) jQuery .removeAttr() has only one parameter
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 7d6edc6f182009726e9675ae832385f37e16c4e0)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit a400e3c37e4b84da52fc5bc8371a0048f99cfa17)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit a400e3c37e4b84da52fc5bc8371a0048f99cfa17)
commit 645945a339f9a01a31a08bc8c14e4c31a289234d
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Jun 26 16:40:09 2013 -0400
Bug 10511: fix message preference form glitch concerning phone notifications
An error in the onclick for phone notices causes the "Do not notify"
checkbox to be checked when the phone checkbox is checked. Also,
checking "Do not notify" does not uncheck the phone checkbox.
Test plan:
1) Enable TalkingTechItivaPhoneNotification
2) Browse to the new patron screen ( memberentry.pl )
3) In the patron messaging preferences check the Phone checkbox
4) Not the "do not notify" checkbox is then checked
5) Uncheck the "do not notify" checkbox, and check the Email checkbox as well
6) Now check the "do not notify" checkbox, note the Phone checkbox remains checked
7) Apply this patch
8) Repeat steps 3-6, noting the odd behavior is no longer present
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit e608f4d48c09e025fc10d47668bb40c0d3d686a7)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Works as expected. EnhancedMessagingPreferences needs to be set to reproduce.
(cherry picked from commit 475bb4e6bf79a21fed261e91ed466950374636ec)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 475bb4e6bf79a21fed261e91ed466950374636ec)
commit 056c2feeaea534c1d1ba0556f5b4464d7da84dee
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 2 14:25:37 2013 -0400
Bug 7257: Add a link to remove an individual title from a list in the OPAC
It should be possible when viewing the contents of a list to click a
link to remove an individual title from the list without having to check
a checkbox and click another button.
This patch adds a link to each list item to "Remove from this list."
The functionality is JavaScript-dependent, automatically checking the
appropriate checkbox and submitting the form to delete.
To test, view a list for which you have delete permission. There should
be a "Remove from this list" link next to each item on the list. Test
delete functionality by:
- Clicking the link and then clicking cancel.
- Clicking the link and confirming.
- Checking more than one checkbox and then clicking a single remove
link (only the one corresponding record should be removed).
- Checking one or more checkboxes and clicking the "Remove from list"
link at the top of the page.
If JavaScript is disabled the links should not appear.
There are now two delete confirmation messages: One if you're removing
only one item, another if you're removing more than one. This is true
whether you use the links or the checkboxes.
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 cf902c704ba9b0560bc8ff2006fe5763ffa2a090)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 6df54fd2fa2e33166c5c6e24b5aabf8299ed5ef9)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 6df54fd2fa2e33166c5c6e24b5aabf8299ed5ef9)
commit 0de04775a63a4fae6ab5773a4db57a0424567881
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Thu Jul 11 16:33:33 2013 +0200
Bug 10543 - add mandatory subfield check to addorderiso2709.pl
When adding orders from staged file, you can create one order per
record using item form in the bottom of addorderiso2709.pl. The
form was missing checks of mandatory item fields; this patch
adds those checks.
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
All 3 patches pass tests and QA script.
Some additional notes on the test plan from the first patch:
It took me a while to figure out a combination of subfields
that would trigger the bug. I am not sure about the condition
that transforms the input field into a textbox as it does
not seem to happen for every field.
What worked in the end was (MARC21):
- $g cost, normal purchase price = mandatory
- $h serial enumeration/chronolgy = optional, filled with
text over 100 characters
Checked for:
- Adding items in cataloguing
Was able to reproduce the problem, mandatory check works
as expected.
- Adding items from staged file in acq
Was not able to trigger the problem, because we don't edit
the item here, but mandatory check works as expected.
- Addings items for serial subscriptions
Was not able to trigger the problem, because we don't edit
the items here, but mandatory check works better as before
as missing mandatory fields are now highlighted and weren't
before.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 2c7e1390b45e497676ea4f414520708577cf761a)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Couldn't reproduce using $i as in the test plan, but $o triggered the problem, which this patch series fix.
(cherry picked from commit 561c436e933e6c1305808f13afd9cabf95e81e8e)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 561c436e933e6c1305808f13afd9cabf95e81e8e)
commit 9adf171458d754063a34a433b5d6de2052e55bff
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Thu Jul 11 16:30:27 2013 +0200
Bug 10543 - Unify item mandatory subfields check
Use of CheckMandatorySubfields from cataloging.js
everywhere an item cataloging form is checked for
mandatory fields.
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 0d4724e81b94b290a5b58970a8f59ebe8340f165)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Couldn't reproduce using $i as in the test plan, but $o triggered the problem, which this patch series fix.
(cherry picked from commit 85420d30ecf1bdd62eca323c5703f684414953b3)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 85420d30ecf1bdd62eca323c5703f684414953b3)
commit 60b679fa22a4fca5a54c4e25183d1cb425afded0
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Fri Jul 5 15:20:59 2013 +0200
Bug 10543: fix false warnings from checks of mandatory item fields
Under certain circumstances, when editing an item, you get a popup
warning
"1 mandatory fields empty (highlighted)".
Even though all mandatory fields are filled in.
This occurs when there is a field with a huge content (more than 100
characters) that gets displayed in a textarea instead of input.
This patch corrects the Javascript form check by using siblings().
Also adds a more precise filter to find mandatory inputs because
looking in full page may bring unwanted results.
Test plan :
- In a framework, make sure you have in item field :
An optional subfield (without authorised value),
then a mandatory subfield, then an optional subfield
next to mandatory subfield
For example : $i (optional), $r (mandatory) and $s (optional)
- Open a biblio record and create a new item
- Enter more than 100 characters in $i, fill $r and $s
- Click "Add item"
- Edit this item
=> You get a textarea for $i
- Empty $s and Save
=> Without patch, you get a warning and form is not saved and you see that $s is yellow while it should be $r
=> With patch, form is saved
- Re-edit this item
- Empty $r and save
=> You get a warning and form is not saved
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Notes on last patch.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 651ea298ea90742a2c56bbb693a4fbbb0064d5b2)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Couldn't reproduce using $i as in the test plan, but $o triggered the problem, which this patch series fix.
(cherry picked from commit 9f5f05d40d2ee8a357d25472cd200a7f748de0e2)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 9f5f05d40d2ee8a357d25472cd200a7f748de0e2)
commit 1374b9ecb527303d0f9d4de9b60e85f37904df2f
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Fri Aug 16 16:52:26 2013 -0300
Bug 10745: remove more ambiguity for translators for XSLT subfieldSelect parameters
As in Bug 6278, this patch replace ">at<" with ">a_t<"
so not to mislead translators. Found more cases that
initial description.
To test:
1) Check that problem exists and only on xslt files,
using your preferred language
egrep -B10 "^msgid \"at\"" misc/translator/po/xx-YY-i-staff-t*
2) Apply the patch
3) Update translation file
(cd misc/translator; perl translate update xx-YY)
4) Verify the problem is gone, repeat 1
5) If you like verify new entries in PO file
egrep -B15 "^msgid \"a_t\"" misc/translator/po/xx-YY-i-staff-t*
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested this with field 780 and running a Dutch translation.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 5b9cd85dd0dbd7e3470c783e0e024ad32df2f8b5)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 2d1ca97d6501ae273dabfd7d71bb6cce4c5e6725)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 2d1ca97d6501ae273dabfd7d71bb6cce4c5e6725)
commit 35ef2d36845933336b65e32e4fb9e944529339af
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Aug 16 07:21:10 2013 -0400
Bug 10664 [QA Followup] - fix error in overdue_notices.pl if there is no active currency
Fixes the following koha-qa.pl error:
FAIL misc/cronjobs/overdue_notices.pl
OK pod
OK forbidden patterns
OK valid
FAIL critic
# Variables::ProhibitConditionalDeclarations:
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit e476378323eb8dd31e67e4741d271d88de61b59e)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 22f96c6ebeb77da5efe7285d1980ce705e22726e)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 22f96c6ebeb77da5efe7285d1980ce705e22726e)
commit 34e37dca5b101567adbbb3b2fbd4b66eb49b48ba
Author: Sophie Meynieux <sophie.meynieux at biblibre.com>
Date: Wed Jul 31 08:04:25 2013 +0200
Bug 10664: fix error in overdue_notices.pl if there is no active currency
If there is no active currency, when running overdue_notices.pl
you get a sofware error "Can't use an undefined value as a HASH
reference" on GetCurrency() function call.
With this patch, if there is no active currency, fines are formated
by default 0.00 and notices are correctly generated.
Test plan :
- have at least one borrower with overdue that should trigger a notice
- verify that there is no active currency (Adminitration > Currency &
Exchange rates)
- run misc/cronjobs/overdue_notices.pl -v -n (to get the notice directly
on output)
=> without the patch you get the software error
=> with the patch, notices are correctly generated
If an active currency is defined, the script overdue_notices.pl runs
the same with or without patch
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit a9a3bb7b3d7e8e862cf0f772246667258a20b786)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 5e12ca5684ee19c54685a4dc935fb242eaf0c3bc)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 5e12ca5684ee19c54685a4dc935fb242eaf0c3bc)
commit f7c12eb41c044a6c55478cf3d83e9d2573ead463
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Tue May 28 15:43:05 2013 +0200
Bug 10362: ensure that all messages and alerts are shown upon checkin
If an item is returned and has mutiple error or warnings (e.g.,
it both needs to be transferred and the patron was debarred
in the course of the return), because of a bug in the template,
not all of the messages would be displayed.
This patch changes the template to show both messages and alerts.
Test plan :
- Perform an checkout that will a checkin :
* need a transfert (return in a different branch)
* set user debarred (depends on issuing rules)
- Perform check-in
=> You get tranfert message and debarment alert
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 5192fd81adaccf9b0f4a01dcc0ffc689edc9468f)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 8525d49e0601c85807235c007f712666c2abbceb)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 8525d49e0601c85807235c007f712666c2abbceb)
-----------------------------------------------------------------------
Summary of changes:
acqui/check_uniqueness.pl | 4 +-
authorities/blinddetail-biblio-search.pl | 43 ++++++++++++++++++++
cataloguing/value_builder/marc21_field_007.pl | 2 +-
.../prog/en/includes/messaging-preference-form.inc | 5 +-
koha-tmpl/intranet-tmpl/prog/en/js/cataloging.js | 17 ++++++++
.../prog/en/modules/acqui/addorderiso2709.tt | 13 ++++++
.../prog/en/modules/acqui/neworderempty.tt | 9 +---
.../prog/en/modules/acqui/orderreceive.tt | 15 +-----
.../authorities/blinddetail-biblio-search.tt | 3 +
.../prog/en/modules/cataloguing/additem.tt | 22 ++--------
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 3 +-
.../prog/en/modules/serials/serials-edit.tt | 14 +++----
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 6 +-
.../prog/en/xslt/NORMARCslim2intranetDetail.xsl | 2 +-
.../prog/en/xslt/NORMARCslim2intranetResults.xsl | 2 +-
.../prog/en/xslt/UNIMARCslim2intranetDetail.xsl | 4 +-
koha-tmpl/opac-tmpl/prog/en/css/opac.css | 14 ++++++-
.../opac-tmpl/prog/en/modules/opac-shelves.tt | 24 ++++++++++-
.../prog/en/xslt/NORMARCslim2OPACDetail.xsl | 2 +-
.../prog/en/xslt/NORMARCslim2OPACResults.xsl | 2 +-
misc/cronjobs/overdue_notices.pl | 4 +-
21 files changed, 146 insertions(+), 64 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list