[koha-commits] main Koha release repository branch master updated. v3.18.00-908-g4e0468e
Git repo owner
gitmaster at git.koha-community.org
Wed May 6 15:41:42 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 4e0468e8c2587fa4f51cb22b59ac5466383bbab1 (commit)
via 24e0c1b756945517e4ec02af81bc761128b1a907 (commit)
via 5caa05104dfc30d70be5ea1b17d406b5392d59bc (commit)
via 6844d9e6b58d95ad1af4ee6d0eb2e7ba1ad50905 (commit)
via 90dd3cfa632509f56849668897d2d3746d201cf6 (commit)
via a6247f449a476f9768ad4d28c69587ca1922747a (commit)
via fba5ce27545fcb5810f32ca42527065958af7f8b (commit)
via 88ce53364203fa8a7c3b4b9f1f8fa68fc2904328 (commit)
via 5d3b2c5c2f9c93aae5bb8658c8e3d7d0af86270d (commit)
via af78ccd4410d2390c052897fd1cef796adab39ad (commit)
via a0ccc0d246d61e0a7e8b6936ef4eba9a77f599d8 (commit)
from 9d50a1189d05618f6ef12d6f8696cab57861aba9 (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 4e0468e8c2587fa4f51cb22b59ac5466383bbab1
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Apr 24 00:40:46 2015 -0400
Bug 14057: Inventory is painfully slow
This patch is a rough start. I believe it runs exponentially
faster, but its equality to the previous version needs to be
tested before I clean it up to acceptable standards.
Nested hashes of hashes was being a debugging nightmare.
Moved the SQL select to C4::Koha.
Changed the GetItemsForInventory to have a hashref parameter.
Added interface, in case there is a need for 'opac' vs. 'staff'.
Added t/db_dependent/Items/GetItemsForInventory.t
Added t/db_dependent/Koha/GetKohaAuthorisedValuesMapping.t
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 24e0c1b756945517e4ec02af81bc761128b1a907
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Mon Apr 27 23:54:37 2015 +0000
Bug 14056: Small punctuation error in description for deleting a holiday
This patch just inserts a semi-colon into the description so that it makes more grammatical sense.
Test plan:
1) Go to Tools --> Calendar
2) Create or find a holiday, click on it so the editing options come up
3) Click on the question mark link to show the description for the option "Delete the exceptions on a range"
4) Confirm that this now has a semi-colon and reads "... Be careful about your scope range; if it is oversized you could slow down Koha."
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 5caa05104dfc30d70be5ea1b17d406b5392d59bc
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Tue Apr 28 18:24:27 2015 -0300
Bug 12192: Template toolkit code in HTML attributes is picked up into po-files
This patch gives a partial solution for this problem.
It ignores strings like "[% something %]", but not
"[% IF ( value ) %][% value %][% END %]"
We get 100+ strings less to translate
To test:
1) Update translation files for your preferred language
2) Apply the patch
3) Update again
4) Compare, you must find 100+ strings removed from
translation files
eg.
-msgid "[% SEARCH_RESULT.biblionumber |url %]"
-msgid "[% accepteddate | $KohaDates %]"
-msgid "[% amountoutstanding | format('%.2f') %]"
-msgid "[% authtypetext |html %]"
-msgid "[% barcode_llx |html %]"
-msgid "[% barcode_lly |html %]"
-msgid "[% biblio.quantity.length ? biblio.quantity : 1 %]"
-msgid "[% billingdate | $KohaDates %]"
-msgid "[% borname |html %]"
...
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Verified all strings removed from the po files were
pure TT.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 6844d9e6b58d95ad1af4ee6d0eb2e7ba1ad50905
Author: Marc Véron <veron at veron.ch>
Date: Sat May 2 09:25:56 2015 +0200
Bug 14119: Missing de-DE DISCHARGE message (German wording)
This patch adds DISCHARGE sample message to de-DE sample_notices.pl
(in GErman wording)
To test:
1) prove xt/sample_notices.t, it fails
2) apply the patch
3) prove again, this time no errors
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Right wording :)
Fixed version
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 90dd3cfa632509f56849668897d2d3746d201cf6
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Fri May 1 23:40:50 2015 -0300
Bug 14119: Missing de-DE DISCHARGE message
This patch adds DISCHARGE sample message to de-DE sample_notices.pl
To test:
1) prove xt/sample_notices.t, it fails
2) apply the patch
3) prove again, this time no errors
As original Bug 8007 sample message this is not translated,
so a German counter patch is welcome.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
As noted, a German counter patch is preferred. :)
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a6247f449a476f9768ad4d28c69587ca1922747a
Author: Marc Véron <veron at veron.ch>
Date: Sat May 2 21:47:01 2015 +0200
Bug 14122: Patron card: Software error when creating using borrower_number as parameter from URL
To test prepare an URL like the following:
...cgi-bin/koha/patroncards/create-pdf.pl?borrower_number=61&template_id=24&layout_id=21&start_card=1
Change the values for borrower_number, template_id and layout_id to something that exists in your system.
Without patch, the URL leads to a software error:
Can't use an undefined value as a HASH reference at /usr/share/kohaclone/patroncards/create-pdf.pl line 118.
With patch, a PDF with the patron card is created.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
NOTE: This does NOT deal with the case where borrowernumber,
template_id, or layout_id are invalid. This only deals with
the case where they do exist.
Invalid borrowernumber still gives same error.
Invalid template_id or layout_id gives error on line 111.
Those are beyond the scope of this bug.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit fba5ce27545fcb5810f32ca42527065958af7f8b
Author: Marc Véron <veron at veron.ch>
Date: Mon May 4 11:45:45 2015 +0200
Bug 14127: Typo in message preference form - "mesage"
This path fixes the typo.
To reproduce and test:
Go to a patron's detail page
The message appears as hint in column-header 'Digests only (i)'
Sponsored-by: Universidad de El Salvador
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 88ce53364203fa8a7c3b4b9f1f8fa68fc2904328
Author: Marc Véron <veron at veron.ch>
Date: Wed Apr 22 08:56:34 2015 +0200
Bug 14033: Capitalization: confirmation message on deleting an authority type
This bug fixes capitalization of "No, Do Not Delete" in following templates:
koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tt
To test: Verify that the strings are properly replaced.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Fixed some tabs.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 5d3b2c5c2f9c93aae5bb8658c8e3d7d0af86270d
Author: Hector Eduardo Castro Avalos <hector.hecaxmmx at gmail.com>
Date: Sun May 3 21:13:08 2015 -0600
Bug 14126: Typo on order receive page
A typo found while doing translation:
To test
1) Go to dir 'intranet-tmpl/prog/en/modules/acqui/neworderempty.tt'
line 268 and check the typo "To notify on reveiving:"
2) Apply the patch
3) Repeat step 1 and check if the typo is fixed
Sponsored-by: Universidad de El Salvador
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit af78ccd4410d2390c052897fd1cef796adab39ad
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Apr 30 10:06:25 2015 +0200
Bug 14044: Don't escape html characters
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a0ccc0d246d61e0a7e8b6936ef4eba9a77f599d8
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Apr 22 09:39:55 2015 -0400
Bug 14044: Escape json strings for patron searches
In a couple of patron searches, the address is displayed.
If the address contain invalid json characters, DataTables won't manage
to parse the results and display them.
This patch makes the templates more readable by creating a BLOCK instead
of a long line and escape the invalid json characters calling the TT
plugin (To.json).
Test plan:
Edit a patron and add something like:
patron <address> \123 ☎ ⚑
in the address field.
Search for this patron using the main patron search (members/member.pl)
and the guarantor search.
Confirm that a result with this patron is correctly displayed.
Regression test: Since Koha::Template::Plugin::To::json is modified,
confirm that the add users to basket search (on acqui/basket.pl?basketno=X
click on the "Add user" button) still works as expected.
Signed-off-by: Christopher Brannon <cbrannon at cdalibary.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Items.pm | 41 ++++-
C4/Koha.pm | 45 ++++++
Koha/Template/Plugin/To.pm | 4 +-
.../data/mysql/de-DE/mandatory/sample_notices.sql | 3 +-
.../prog/en/includes/messaging-preference-form.inc | 2 +-
.../prog/en/modules/acqui/neworderempty.tt | 2 +-
.../prog/en/modules/admin/authtypes.tt | 4 +-
.../intranet-tmpl/prog/en/modules/admin/cities.tt | 2 +-
.../prog/en/modules/admin/classsources.tt | 4 +-
.../prog/en/modules/admin/currency.tt | 4 +-
.../prog/en/modules/admin/marctagstructure.tt | 4 +-
.../prog/en/modules/admin/matching-rules.tt | 2 +-
.../prog/en/modules/admin/patron-attr-types.tt | 2 +-
.../prog/en/modules/admin/stopwords.tt | 4 +-
.../en/modules/members/tables/guarantor_search.tt | 16 +-
.../en/modules/members/tables/members_results.tt | 12 +-
.../prog/en/modules/tools/holidays.tt | 2 +-
misc/translator/xgettext.pl | 1 +
patroncards/create-pdf.pl | 2 +-
t/db_dependent/Items/GetItemsForInventory.t | 156 ++++++++++++++++++++
.../Koha/GetKohaAuthorisedValuesMapping.t | 54 +++++++
tools/inventory.pl | 30 +++-
22 files changed, 363 insertions(+), 33 deletions(-)
create mode 100755 t/db_dependent/Items/GetItemsForInventory.t
create mode 100755 t/db_dependent/Koha/GetKohaAuthorisedValuesMapping.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list