[koha-commits] main Koha release repository branch master updated. v16.05.00-1237-gb6e51b6
Git repo owner
gitmaster at git.koha-community.org
Fri Oct 28 14:06:59 CEST 2016
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 b6e51b685ee8c04d4dfaaf4b4f48f76049bff1c9 (commit)
via c8f6794bb104d4f1f597ec6b7f77a8e20372d41f (commit)
via 8f436a50759ae4ca64f85ac5035a933a6d094e3f (commit)
via ddb1ecb9d8b4a29a3c0360a07aa539d378193747 (commit)
from c7bc14cead116d7a8737be8da19b688e53049864 (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 b6e51b685ee8c04d4dfaaf4b4f48f76049bff1c9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed May 11 14:31:26 2016 +0100
Bug 15801: minor fixes
- Fix a tab
- Fix a variable name in a template
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
With all patches applied no errors.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit c8f6794bb104d4f1f597ec6b7f77a8e20372d41f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 10 17:26:35 2016 +0000
Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworkinfo
This was the "Get" subroutine for the framework, it can be easily
replaced with a call to the Koha::BiblioFrameworks->find method.
This patch also replaces some confusing wordings (framework vs frameworkcode).
Test plan:
On the circulation home page, you should see a "Fast cataloguing" link
if the FA framework exists.
Note that the admin/marctagstructure.pl has already been tested in the
previous patch.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Link pops Ok
No errors
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 8f436a50759ae4ca64f85ac5035a933a6d094e3f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 10 16:56:01 2016 +0000
Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::getframeworks
C4::Koha::getframeworks returned a hashref of biblio frameworks.
It was mainly used to generate the dropdown list of frameworks.
The scripts modified in this patch did not necessary order the element
by description (frameworktext), the displays were not consistent from
one screen to another.
Using the same search method everywhere:
Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });
We will know always get the framework in the same order.
Test plan:
Following the different pages modified by this patch, and make sure the
frameworks are displayed correctly in the dropdown list:
1/ acqui/z3950_search.pl - Create an order from an external source.
2/ admin/fieldmapping.pl - Define some mappings keyword / MARC field
3/ admin/marctagstructure.pl - On the MARC frameworks admin page, select
another framework than the default one and click on the 'Search' button
4/ catalogue/MARCdetail.pl - On the MARC defail page, change the
framework you want to use to display the record
5/ cataloguing/addbiblio.pl - Add or edit a biblio record, change its
framework. When editing, the framework of the record should be selected
by default
6/ cataloguing/addbooks.pl - Go on the cataloguing home page and click
on the "New record" button. You should see all the frameworks
7/ cataloguing/merge.pl - Select 2 biblio records to merge. On the first
step (select the merge reference), you should be allowed to select the
framework to use.
8/ tools/inventory.pl - On the inventory page, the "Item statuses" part
should be populated as before this patch
9/ tools/manage-marc-import.pl - Stage records for import. Before
importing them into the catalog, you should see the framework dropdown
list.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Works Ok.
No errors
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit ddb1ecb9d8b4a29a3c0360a07aa539d378193747
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 10 16:06:14 2016 +0000
Bug 15801: Koha::BiblioFrameworks - Remove C4::Koha::GetFrameworksLoop
The C4::Koha::GetFrameworksLoop retrieves biblio frameworks and returns
them ordered by the description (frameworktext). If a parameter is
passed, a selected flag is set. The selection of the options should be
done on the template side.
These 2 calls can be replaced with
Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });
Test plan:
1/ Go on a Labeled MARC biblio view (catalogue/labeledMARCdetail.pl)
You should see a dropdown list with the biblio frameworks. The framework
of the record should be selected by default
2/ Create a sql report using the biblio_framework parameter, something
like:
SELECT COUNT(*) FROM biblio WHERE frameworkcode=<<framework|biblio_framework>>
Save and execute the report.
You should get a dropdown list with the framework list.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Both dropdowns Ok
No errors
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Koha.pm | 134 +-------------------
acqui/z3950_search.pl | 18 +--
admin/fieldmapping.pl | 42 ++----
admin/marctagstructure.pl | 24 +---
catalogue/MARCdetail.pl | 21 +--
catalogue/labeledMARCdetail.pl | 10 +-
cataloguing/addbiblio.pl | 10 +-
cataloguing/addbooks.pl | 15 +--
cataloguing/merge.pl | 16 +--
circ/circulation-home.pl | 8 +-
circ/circulation.pl | 3 +-
.../prog/en/modules/acqui/z3950_search.tt | 8 +-
.../prog/en/modules/admin/fieldmapping.tt | 26 ++--
.../prog/en/modules/admin/marctagstructure.tt | 36 +++---
.../prog/en/modules/catalogue/MARCdetail.tt | 8 +-
.../prog/en/modules/catalogue/labeledMARCdetail.tt | 8 +-
.../prog/en/modules/cataloguing/addbiblio.tt | 8 +-
.../prog/en/modules/cataloguing/addbooks.tt | 8 +-
.../prog/en/modules/cataloguing/merge.tt | 12 +-
.../prog/en/modules/tools/manage-marc-import.tt | 2 +-
reports/guided_reports.pl | 10 +-
t/db_dependent/Koha.t | 43 -------
tools/inventory.pl | 9 +-
tools/manage-marc-import.pl | 12 +-
24 files changed, 127 insertions(+), 364 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list