[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-66-g60465fc
Git repo owner
gitmaster at git.koha-community.org
Thu May 9 09:42: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 60465fc463618be1bb07e948ab79aaee71e14e9c (commit)
via 700af3fb2131ea540a800978146493db24fb8725 (commit)
via 74ea9cf2f5207e4188c6eab87e84a90f2010ac72 (commit)
via bdc0d295eb200d1d31a0c5cf06e2b1f931e6dd7a (commit)
via dadd6c8bba1d2bef001238d768d36b3ec1eb8381 (commit)
via 242df9da930e0eff72fa71221cc1d21e5c2ef25b (commit)
via e552ecd0d1e1eae2c18f908b48df17a1acc33939 (commit)
via 25f4322fc12d27f3a7dbea62494f3658c68378c3 (commit)
from ea3005fa49ffc4699e697d925e6828ed8f602101 (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 60465fc463618be1bb07e948ab79aaee71e14e9c
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Fri Apr 12 17:24:17 2013 +0200
Bug 10033 - dangerous query in _koha_modify_item
The SQL query build in C4::Items::_koha_modify_item performs an update on a row of items table identified by itemnumber.
Actually the query is build using a hash of datas :
for my $key ( keys %$item ) {
$query.="$key=?,";
push @bind, $item->{$key};
}
But this hash contains 'itemnumber' key, so you get an update including the primary key.
It is actually harmless but may be dangerous.
This patch simply skips itemnumber key in above loop.
Test plan :
Check you can create and modify items.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 598dfe27224f517fafa06df75521c623992ecbe0)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit ba8e383cf6835e204259063e6c18ac9c3892029b)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 700af3fb2131ea540a800978146493db24fb8725
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Apr 15 08:39:26 2013 -0400
Bug 8419 - Suspended holds appear on the daily holds queue
This bug was reintroduced by the patch for bu 5911: Transport Cost Matrix
Test Plan:
1) Place a hold on a record
2) Run build_holds_queue.pl
3) Verify the hold is showing in the holds queue
4) Suspend the hold
5) Re-run build_holds_queue.pl
6) Note the hold is still in the holds queue
7) Apply patch
8) Re-run build_holds_queue.pl
9) Note the hold is no longer in the holds queue
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes test plan and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit d098a7c298437b2fd6ced6a8237f98f3221b810f)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 74ea9cf2f5207e4188c6eab87e84a90f2010ac72
Author: Magnus Enger <magnus at enger.priv.no>
Date: Mon Apr 15 19:02:46 2013 +0200
Bug 7054 - NORMARC: Fix default for 000 position 17
Someone at the library education in Oslo told me that it would be
better to have the default for 000/17 set to 1, instead of 2 as it
is today.
To reproduce:
- Run through the Web-installer in Norwegian and choose NORMARC as
the MARC dialect
- Go to Home > Cataloging > Add MARC record and start to add a new
record
- Click in the 000 field and it should be filled with:
" nam a22 2 4500"
- Reload the page, then open the value builder for 000 and click on OK
- 000 should get filled with the same string as above
To test:
- Apply the patch and repeat the steps from above. The default value
for 000 should now be:
" nam a22 1 4500"
(Don't be confused by the 1s and the 2s. A value of 1 in position 17
means "level 2", and a value of 2 means "level 1" - that is how it
is defined in the "standard":
1 = Nivå 2, iflg. Katalogiseringsregler
2 = Nivå 1, iflg. Katalogiseringsregler)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Small changes. Didn't test in a NORMARC installaton, but
trusting Magnus with this and seeing no reason why it
shouldn't work.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 064fc8b5223b19a57c658e7ca3444df7c017a444)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit bdc0d295eb200d1d31a0c5cf06e2b1f931e6dd7a
Author: Magnus Enger <magnus at enger.priv.no>
Date: Mon Apr 15 19:50:19 2013 +0200
Bug 7055 - NORMARC: Fix 008 position 15-17 and 35-37
This patch does several things:
- Set the default for 008/15-17 to "no " (yes, there is space at the end)
- Link from 008/15-17 in the value builder to NORMARC country codes
- Set the default for 008/35-37 to "nor" (by setting the
DefaultLanguageField008 syspref)
- Link from 008/35-37 in the value builder to NORMARC language codes
- Fix a missing <tr> around field 35-37
To reproduce:
- Run through the Web-installer in Norwegian and choose NORMARC as
the MARC flavour
- Go to Home > Cataloging > Add MARC record and add a new record
- Click in the field for 008. The default should look like:
130415t xxu||||| |||| 00| 0 eng d
^^^ ^^^
- Reload the page and open the value builder for 008. Problems:
- The text for 15-17 links to MARC21 country codes
- The default for 15-17 is xxu
- The text for 35-37 links to MARC21 language codes
- The default for 35-37 is eng
- If you choose e.g. "Monografier" in the top dropdown then click
on "OK" the window does not close
To test:
- Apply the patch and run through the Web-installer again, selecting
Norwegian and NORMARC
- Go to Home > Cataloging > Add MARC record and add a new record
- Click in the field for 008. The default should look like:
130415t no ||||| |||| 00| 0 nor d
^^^ ^^^
- Reload the page and open the value builder for 008.
- Check that...
- The default for 15-17 is "no " (with a space at the end)
- The link goes to NORMARC country codes
- The default for 35-37 is "nor"
- The link goes to NORMARC language codes
- Select something from the top dropdown and click "OK". Check that the
window closes and that the values that are entered into the 008 field
matches what you chose in the popup window.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Trusing Magnus is right, so testing for any regressions mainly, all good
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Only changes NORMARC specific plugin and system preferences
files. Changes all seem logical to me.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Conflicts:
installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit dadd6c8bba1d2bef001238d768d36b3ec1eb8381
Author: David Cook <dcook at prosentient.com.au>
Date: Tue Apr 23 12:58:19 2013 +1000
Bug 10097 - Hide framework selection when importing staged authority records
Currently, when importing authority records using the "Manage staged
MARC records" tool, it will show the text "Add new bibliographic records
into this framework:" followed by a drop-down menu of possible frameworks.
Since these are bibliographic frameworks and we're importing authority
records which do not use them, we have no need to show this information.
I'm proposing just a little patch to display this info only for
bibliographic records. From my tests, everything seems to work fine
without this text and the drop-down, although I've only uploaded one
MARC21 authority record at a time.
--
Test Plan:
Before applying patch...
1) Find yourself an authority record. I recommend downloading your
favourite author from: http://authorities.loc.gov/
2) Stage MARC for import. Choose "Authority" as your record type.
3) Go to "Manage staged records"
4) Underneath the button "Import this batch into the catalog", you
should see the text "Add new bibliographic records into this framework:"
followed by a drop-down of the available frameworks.
Optionally) You can also try this for bibliographic records. You'll find
the same.
After applying the patch...
5) Repeat steps 2 and 3.
6) Underneath the button "Import this batch into the catalog", you
should just see a table listing your MARC record(s).
7) Stage MARC for import. Choose "Bibliographic" as your record type.
8) Go to "Manage staged records".
9) You should find step 4 still to be true (i.e. the "Add new
bibliographic..." text should still be there).
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Small template change, passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 242df9da930e0eff72fa71221cc1d21e5c2ef25b
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Apr 30 14:39:48 2013 -0400
Bug 9957 - Missing cancel link on subfield editing page
The subfield edit page has an edit bottom at the top of the page. Almost
no other edit screens do this. It would be more consistent to put it at
the bottom. Also missing is a "cancel" link. This patch fixes both
issues.
The patch also adds "Default" to the breadcrumbs when editing a subfield
in the default framework.
To test, apply the patch and edit a subfield: MARC frameworks -> MARC
structure -> Subfields -> Edit. The "Save changes" button should appear
at the bottom of the page alonside a "Cancel" link. Both should work
correctly.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Template change only, improves consistency and works
nicely.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit e552ecd0d1e1eae2c18f908b48df17a1acc33939
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Apr 26 14:20:49 2013 -0400
Bug 9266 - Untranslated strings in tags moderation
There are a couple of English strings in tags moderation JavaScript
which are not properly enclosed in the _() function enabling
translation. As a result, clicking a translated 'Approve' or
'Reject' button in the table of tags would change the button's
neighbor's label to the English string. This patch
corrects it.
To test, apply the patch and regenerate a translation to test with. Go
to Tools -> Tags and find a list of tags to moderate (pending, approved,
or rejected). When you click on an 'Approve' or 'Reject' tag in the
table of tags, the buttons in each Approve/Reject pair should retain
their correct translated label. For instance, looking at approved tags
in French:
[ Approuvé ] [ Rejeter ]
Clicking the "Rejetee" button should change the state to:
[ Approuver ] [ Rejetée ]
Clicking "Approuver" should return the buttons to the first state.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 25f4322fc12d27f3a7dbea62494f3658c68378c3
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Apr 25 09:34:17 2013 -0400
Bug 10111 - Layout on basket summary page a bit inconsistent
Some details in the summary of basket information were not marked up
consistently with others on the page. This patch makes the markup
consistent for a consistent appearance.
To test, view a basket in Acquisitions which is part of a basketgroup.
Information should be displayed consistently for baksets in both open
and closed basket groups.
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Works as expected
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Template change only, works nicely.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
-----------------------------------------------------------------------
Summary of changes:
C4/HoldsQueue.pm | 5 +++-
C4/Items.pm | 1 +
cataloguing/value_builder/normarc_field_008.pl | 4 +-
cataloguing/value_builder/normarc_leader.pl | 4 +-
.../nb-NO/1-Obligatorisk/system_preferences.sql | 2 +
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 23 ++++++++-----------
.../en/modules/admin/marc_subfields_structure.tt | 8 ++++--
.../cataloguing/value_builder/normarc_field_008.tt | 7 +++--
.../intranet-tmpl/prog/en/modules/tags/review.tt | 4 +-
.../prog/en/modules/tools/manage-marc-import.tt | 2 +
10 files changed, 34 insertions(+), 26 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list