[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.09-27-ge1b6771
Git repo owner
gitmaster at git.koha-community.org
Sun Aug 4 15:28: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.10.x has been updated
via e1b677188a0464a9e4752313a3bb6843bdb38a62 (commit)
via a05d90ff054785cebf82c9ecc6cfaff1e64c4df9 (commit)
via c0879481a4ad4bd32fbb00530115bea5fa0bdbc0 (commit)
via a582ba6100c1e5aae9aca5f11d22d3eb564f22ae (commit)
via 44ee57d306676e374cbe6d2da7632ec7833ccf43 (commit)
via 459422c8bad09a8301cf47a7b39abf15a3b265ff (commit)
via e22738e3b16593ef5282b493818fe220fb889d24 (commit)
via 3a486d8d9d64a371faa7904589c19c6e4bd4aa9c (commit)
via d77a1429846b4cd16f8b7ca9a9b8528bb7f396e0 (commit)
via 7d35ef0205cca51529346a9e079b5d2961330af3 (commit)
from 1140e9c46af8522373ec51fc6282bfc7c4936540 (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 e1b677188a0464a9e4752313a3bb6843bdb38a62
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Sat Jul 6 15:50:54 2013 -0400
bug 10548: fix count of missing required dependencies by koha_perl_deps.pl
To test:
[1] ./koha_perl_deps.pl -m -u
If you have nothing missing, uninstall an optional component.
[2] ./koha_perl_deps.pl -m -u
You should get a number missing of at least 1.
[3] ./koha_perl_deps.pl -m -u -r
You should get the same number, even though the output is less.
[4] Apply patch
[5] ./koha_perl_deps.pl -m -u
Same results as in step 2.
[6] ./koha_perl_deps.pl -m -u -r
The number should differ from the results in step 3.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
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 0134341d9a9883013b7eee3bdc84aa339e618bcc)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 3fcf60e3e2e68f73e9a6292576b6dbc35e450145)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 3fcf60e3e2e68f73e9a6292576b6dbc35e450145)
commit a05d90ff054785cebf82c9ecc6cfaff1e64c4df9
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Jul 1 23:44:39 2013 +0200
Bug 4907: make 'Organize by' filter in suggestions reflect selected option
When using the 'Organize by' option to change the display of the
suggestions, the option is applied, but the pull down always jumps
back to the first entry 'Status'.
This patch fixes that.
To test:
- Try out all settings and verify that after the page reloads the selected
option is applied to your suggestions and the pull down shows
the option you selected.
Note: Until bug 10519 is properly fixed the tabs will not show
the correct descriptions, but the URL will show you the selected
option as parameter: displayby=acceptedby
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 60a4dffbb197fe92e7483b9e0dfcc19bc9b51664)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 5207c513c36fb0e66ed5a8390fc30119e194fad1)
commit c0879481a4ad4bd32fbb00530115bea5fa0bdbc0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Sun Jul 7 14:40:19 2013 +0200
Bug 5858: Followup for INSERT IGNOREs in marc21_framework_DEFAULT.sql
Changes 8 INSERTs into INSERT IGNOREs.
This allows current installs to benefit easier from the new tags/subfields.
Note that running with --force will not achieve the same! The multi-value
inserts will still be aborted, though execution continues.
Test plan:
Run the file or do a new install.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Ran the file on a current install manually.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit bf9eccfeb8069c1b258916c1916138b6317122da)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit bfd82695b19ce20cd638e8c285e7e1aeed89a255)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit bfd82695b19ce20cd638e8c285e7e1aeed89a255)
commit a582ba6100c1e5aae9aca5f11d22d3eb564f22ae
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Tue Mar 19 21:25:20 2013 -0300
Bug 5858: update default MARC21 framework to April 2013 revision
Applies to new installs, although with the follow-up
patch, users can run the installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
script through the mysql client to add new tag and
subfield entries.
To test:
1) Delete MARC21 default framework
2) Apply patch
3) Test that new default framework loads without problem
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Run this file with and without this patch.
This patch adds 24 tags (338 vs 314) and 323 subfields (3951 vs 3628).
Verified that last QA comments were incorporated.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 45669b2566c889c7a73251cdb132c81cf5127117)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 689080867eb810279a912f2d9bf7a78655ffc9dd)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 689080867eb810279a912f2d9bf7a78655ffc9dd)
commit 44ee57d306676e374cbe6d2da7632ec7833ccf43
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Sun Aug 4 00:02:34 2013 -0300
Bug 9353: DBRev 3.10.09.002
Update database number
commit 459422c8bad09a8301cf47a7b39abf15a3b265ff
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Thu Jan 10 19:01:07 2013 -0300
Followup Bug 9353: Missing subfields on MARC21 frameworks
This followup changes updatedatabase.pl.
Only touch frameworks that have the missing subfields.
If both patches are applied, the test plan changes.
To test:
1) dev master system with default and example MARC21 frameworks
2) Go to Home > Administration > MARC frameworks
3) Click on 'MARC structure' of any framework
4) Search for tag 029 (or 863/4/5)
5) Click 'Subfields', there are none.
6) Apply both patches
7) run 'perl installer/data/mysql/updatedatabase.pl'
8) Repeat steps 2-4
9) Click 'Subfields', now they are.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Update works nicely. Checked various frameworks and
results were ok. Also new fields are hidden.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit da4bc6a6315a7f5aca1bb3105549758b8acd7592)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit da4bc6a6315a7f5aca1bb3105549758b8acd7592)
Solved conflict in updatedatabase.pl
This two are necessary for Bug 5858
commit e22738e3b16593ef5282b493818fe220fb889d24
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Sat Jan 5 17:46:34 2013 -0300
Bug 9353 - Missing subfields on MARC21 frameworks
This patch adds missing subfields on MARC fields
029abct
(http://www.oclc.org/bibformats/en/0xx/029.shtm)
863abcdefghijklmnopqstvwxz68 (same for 864/5)
(http://www.loc.gov/marc/holdings/hd863865.html)
To test:
1) dev master system with default and example MARC21 frameworks
2) Go to Home > Administration > MARC frameworks
3) Click on 'MARC structure' of any framework
4) Search for tag 029 (or 863/4/5)
5) Click 'Subfields', there are none.
6) Apply the patch
7) Replace old frameworks, easiest by command line:
mysql -uuser -ppass kohadb -e 'delete from biblio_framework; delete from marc_tag_structure; delete from marc_subfield_structure'
mysql -uuser -ppass kohadb < installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
mysql -uuser -ppass kohadb < installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
8) Repeat steps 2-4
9) Click 'Subfields', now they are.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Updated frameworks are ok.
Note: Only en frameworks are updated, so if other languages need
those fields too, we need some followups.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit d0f3a49d9672cd018a51168b05db7a9d1f17f250)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit d0f3a49d9672cd018a51168b05db7a9d1f17f250)
commit 3a486d8d9d64a371faa7904589c19c6e4bd4aa9c
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon Jul 8 14:29:32 2013 +0000
Bug 10289: (follow-up) don't set cardnumber for test patron
Since the patron barcode is nullable, and since the tests using
the test patron don't care what the barcode is, don't set it. This
avoids the tests failing if the test database happens to already
have a patron record with the hard-coded barcode that used
to be supplied.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 7957dd2a06cd20997f50f49aa1b77e24589ae71c)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 9c90b651f2a1a4420a0b5b7865c0796c1d6b8764)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 9c90b651f2a1a4420a0b5b7865c0796c1d6b8764)
commit d77a1429846b4cd16f8b7ca9a9b8528bb7f396e0
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon Jul 8 14:27:14 2013 +0000
Bug 10289: (follow-up) wrap tests in transaction
Applying new standard method for handling tear-down
of test data.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 47cf3ec24ded468ca4b7b79c8b000b1bdb13d1a8)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit f5a8bec0f7ae7a1118fd003c36c6651906f970af)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit f5a8bec0f7ae7a1118fd003c36c6651906f970af)
commit 7d35ef0205cca51529346a9e079b5d2961330af3
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon May 20 16:37:10 2013 +0200
Bug 10289: UT: Reserves.t needs to create its own data
Try before the patch:
prove t/db_dependent/Reserves.t
And after, it should produce:
t/db_dependent/Reserves.t .. 1/4 #
# Creating biblio instance for testing.
# Creating item instance for testing.
# Deleting item testing instance.
# Deleting biblio testing instance.
# Deleting borrower.
t/db_dependent/Reserves.t .. ok
All tests successful.
Files=1, Tests=4, 1 wallclock secs ( 0.02 usr 0.01 sys + 0.39 cusr 0.02 csys = 0.44 CPU)
Result: PASS
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 6e6c7608b7d9b13d3af8d2115659ef142adb1b01)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit b606e3afd2ad0a64f663bf086b1d792046a5570f)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit b606e3afd2ad0a64f663bf086b1d792046a5570f)
-----------------------------------------------------------------------
Summary of changes:
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 649 ++++++++++++++++----
.../optional/marc21_simple_bib_frameworks.sql | 632 +++++++++++++++++++
installer/data/mysql/updatedatabase.pl | 67 ++
.../prog/en/modules/suggestion/suggestion.tt | 30 +-
koha_perl_deps.pl | 3 +-
kohaversion.pl | 2 +-
t/db_dependent/Reserves.t | 76 +--
7 files changed, 1290 insertions(+), 169 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list