[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-rc3-8-g6bfb91f
Git repo owner
gitmaster at git.koha-community.org
Sun May 19 14:38:40 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.12.x has been updated
via 6bfb91f9df69c887643d0f1ae925595c365da10e (commit)
via a114dc76149c9c27d5b3e0596302d41a9870fc8b (commit)
via d60c9e3ff1759ba0cec946297c73f073784a3ee4 (commit)
via be97025ca43ad725e17d7868e1925b6034be2148 (commit)
via 006e45aeaf9fb1d0c93704c5f9d9ac251f8ff824 (commit)
via 43e0400728901bef61b40866e7007cac7680523b (commit)
via dc7ad9b673587f53fa6cee119c3cd0bebabb0669 (commit)
via ea5f35e47f13d2ef20529fa261d7469c8efb34ce (commit)
from e8030f7f31db1ff9084ea827d3e155358e2054b1 (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 6bfb91f9df69c887643d0f1ae925595c365da10e
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Fri May 17 21:12:05 2013 +0200
Bug 9824: Make it possible to apply/cancel switch
Using another existing string 'Apply filter' we are now
able to cancel the filter... and apply it... and cancel it
again... and so on.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 7acdcb7e2aedf2ff202c009ce053de6dff54e840)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit a114dc76149c9c27d5b3e0596302d41a9870fc8b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri May 17 19:01:06 2013 +0200
Bug 9824: Followup for removing filter
Adds allbaskets parameter to GetBasketsInfosByBookseller. (Only used in booksellers.pl now)
Normally, all 'active' baskets are shown. With allbaskets=1 all baskets :)
In the template I had to rename a loop var supplier to supplier1 to resolve
name conflict between template vars.
In the template I added the string: Cancel filter.
Note that this string is already translated:
msgid "Cancel filter"
msgstr ""
Hope this helps.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Undoing the filter works and I checked that the string gets
translated with the po files in current master.
So this is almost perfect, only we can't apply the filters
again and the link remains 'cancel' when we already did.
Sending a follow-up trying to fix this.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 529434cab891a8b76b3792e12e359f8c8b171519)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit d60c9e3ff1759ba0cec946297c73f073784a3ee4
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Sat May 11 16:07:43 2013 -0400
Bug 10230: show correct matching record
The correct matching record was not always shown on the manage staged
MARC page. This patch corrects the issue and provides the template with
the appropriate ID for the matched record regardless what type of record
it is.
To test:
1) Create a matching record for authorities. For MARC21, the following
is a good choice:
Matching rule code: AUTHPER
Description: Personal name main entry
Match threshold: 999
Record type: Authority record
[Match point 1:]
Search index: mainmainentry
Score: 1000
Tag: 100
Subfields: a
2) Create a record that has the appropriate fields for being matched
with that rule (if you don't already have one).
3) Save the authority record as MARC (Unicode/UTF-8).
4) Stage the file choosing your new matching rule.
5) Note that with these patches, you get a link to the existing
authority and without them you could get any number of strange
things.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script. Additional tests done:
- staged bibliographic records and matched with different
rules and actions. Undid the import.
- staged autohrity recods and matched with the example rule.
Undid the import.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit a278407a476c67c334e1e76fc72c1871a7328af5)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit be97025ca43ad725e17d7868e1925b6034be2148
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Sat May 11 15:19:58 2013 -0400
Bug 10230: Don't limit valid matches to bibs
The patch for bug 9523 added a JOIN to the biblio table when identifying
the best match so that if a matched record had been deleted it would
not hold up the import process. Unfortunately, this broke all authority
matching, since of course authorities don't appear in the biblio table.
This patch adds a join to auth_header as well, and decides which to
check based on the record type.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Comment on third patch of this series.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 4f9174349c99574df0933f2b660938998580d8ba)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 006e45aeaf9fb1d0c93704c5f9d9ac251f8ff824
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Sat May 11 10:40:09 2013 -0400
Bug 10230: no need to use SimpleSearch for matching auths
When introducing QueryParser, I introduced a check for QueryParser at
too high a level, causing authority matching to try and use SimpleSearch
for authorities prematurely, when SearchAuthorities should be handling
it. This patch corrects the level of the check. This patch only moves
three lines, but thanks to the change in if level, it adjusts the
indentation quite a bit.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Comments on third patch of this series.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 2708db52778944f41b36379cc5f202a8ddea6a5a)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 43e0400728901bef61b40866e7007cac7680523b
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Sat May 18 09:09:23 2013 -0400
Bug 10281: searching for a search domain fails
For reasons I cannot fathom, the split() in handling multi-branch
limits was not coming up with a valid search group code. Replacing
the split() with a substr() and creating the CGI parameter as a string
rather than as an arrayref fixes the problem. This problem may not
affect all installations, since I tested this exact feature just under
two months ago and it worked fine, and none of the relevant code has
been changed since then that I can see.
To test:
1) Create search group, and add at least one library to it, in
/cgi-bin/koha/admin/branches.pl
2) Apply patch
3) Try doing a search limited to your search group, making sure that
the search will match items that belong to a library in the search
group
4) Sign off
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
I have failed to recreate the problem on three different dev installs,
both on Ubuntu and Debian, but the current patch does not break
anything as far as I can tell, so I'm signing off.
I tested with two libraries in the same search domain, with each
library owning a different book by the same author. Searching for
the author in
- all libraries,
- individual libraries and
- the search domain that contains both libraries
all return the expected results.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
All tests and QA script pass.
I couldn't reproduce the problem, but didn't find any regressions.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit cd281e488032c57d4a47c3913d5f887c3bca69d8)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit dc7ad9b673587f53fa6cee119c3cd0bebabb0669
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Sun May 12 14:22:54 2013 -0400
Bug 9452: C4::Letters not Plack-compatible
Prior to this patch, at more-or-less random intervals pages working
with notices will cease to function. To test:
1) Apply patch.
2) Try to edit some notices.
3) Trigger some notices.
4) If you were able to edit the notices and trigger the notices, sign
off.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
All tests and QA script pass.
I did a regression script without Plack:
- edit, add, delete and copy notice
- trigger checkout/checkin notice
- print issueslip
No problems found.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 26a4b33e57d102acd5353d6a8a560995c2952429)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit ea5f35e47f13d2ef20529fa261d7469c8efb34ce
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Sun May 19 08:12:40 2013 -0400
Fix incorrect entities in PO files
There were numerous malformed HTML entities in the PO files for various
languages. No longer.
(cherry picked from commit f04b9ec3266211d9a777aefa686e0ea1e9fc0028)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 12 ++--
C4/ImportBatch.pm | 8 ++-
C4/Letters.pm | 20 ++++--
C4/Matcher.pm | 75 +++++++++++---------
acqui/booksellers.pl | 4 +-
catalogue/search.pl | 3 +-
.../prog/en/modules/acqui/booksellers.tt | 11 +++-
.../translator/po/az-AZ-i-opac-t-prog-v-3006000.po | 4 +-
.../po/az-AZ-i-staff-t-prog-v-3006000.po | 4 +-
.../po/da-DK-i-staff-t-prog-v-3006000.po | 2 +-
.../po/de-CH-i-staff-t-prog-v-3006000.po | 8 +-
.../po/de-DE-i-staff-t-prog-v-3006000.po | 8 +-
.../translator/po/el-GR-i-opac-t-prog-v-3006000.po | 2 +-
.../po/el-GR-i-staff-t-prog-v-3006000.po | 6 +-
.../translator/po/fr-CA-i-opac-t-prog-v-3006000.po | 2 +-
.../po/fr-CA-i-staff-t-prog-v-3006000.po | 18 +++---
.../translator/po/fr-FR-i-opac-t-prog-v-3006000.po | 2 +-
.../po/fr-FR-i-staff-t-prog-v-3006000.po | 20 +++---
misc/translator/po/fr-FR-opac-ccsr.po | 2 +-
.../po/hu-HU-i-staff-t-prog-v-3006000.po | 4 +-
.../po/hy-Armn-i-staff-prog-v-3006000.po | 6 +-
.../po/hy-Armn-i-staff-t-prog-v-3006000.po | 2 +-
.../translator/po/it-IT-i-opac-t-prog-v-3006000.po | 2 +-
.../po/pt-BR-i-staff-t-prog-v-3006000.po | 2 +-
.../translator/po/pt-PT-i-opac-t-prog-v-3006000.po | 2 +-
.../po/pt-PT-i-staff-t-prog-v-3006000.po | 8 +-
.../translator/po/ru-RU-i-opac-t-prog-v-3006000.po | 4 +-
misc/translator/po/tet-i-opac-t-prog-v-3006000.po | 2 +-
misc/translator/po/tet-i-staff-t-prog-v-3006000.po | 2 +-
.../translator/po/tr-TR-i-opac-t-prog-v-3006000.po | 8 +-
.../po/tr-TR-i-staff-t-prog-v-3006000.po | 10 ++--
.../translator/po/uk-UA-i-opac-t-prog-v-3006000.po | 4 +-
opac/opac-search.pl | 10 ++-
tools/manage-marc-import.pl | 9 ++-
34 files changed, 162 insertions(+), 124 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list