[koha-commits] main Koha release repository branch master updated. v3.20.00-988-gfd12390
Git repo owner
gitmaster at git.koha-community.org
Fri Oct 30 14:04:08 CET 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 fd123903651435c56ca14d88897e9ce4d7a38bb5 (commit)
via b44ac38ce65e1c8a3bf016acf014ed3bd2cae4bb (commit)
via c104977582f2791c99f6e0bed031d7585a4e5125 (commit)
via 0ba3676df311615aac81dd45107241295a5a333b (commit)
via aa6eed42dab6b1e1e30b29e231f82778d54160ad (commit)
via 0d8de48bf56ae977cff2d0cee3fee62d3fc632a4 (commit)
via 9b9b966cb164d0e23c7cd84fae4daac12c1d57d9 (commit)
via 912e13629698ca12684e834093c7e48598a338ac (commit)
from 05d377042715261f0a905cb505ee3b5098651626 (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 fd123903651435c56ca14d88897e9ce4d7a38bb5
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Oct 14 08:48:30 2015 -0400
Bug 15010: Import patron tool creates 'duplicate' restrictions ( debarments )
If a patron has restrictions and a CSV file of patrons to be overwritten
is uploaded but has no debarred / debarredcomment columns, the a new
restriction will be added that combines all the existing restrictions (
i.e. a new debarment based on the existing borrowers.debarred
and borrowers.debarredcomment fields ).
Test Plan:
1) Create a patron with one or more restrictions
2) Import a CSV file that updates that patron, but with no debarred columns
3) Note a new restrictions is created
4) Delete the new restriction
5) Apply this patch
6) Re-import the CSV file again
7) Note that no new restriction is created
8) Add debarred and debarredcomment columns to the CSV file with a test
date and description
9) Re-import the CSV file again
10) Note the new restriction is added to the patron
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Daniel Grobani <dgrobani at samuelmerritt.edu>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit b44ac38ce65e1c8a3bf016acf014ed3bd2cae4bb
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Thu Oct 29 08:44:54 2015 -0300
Bug 15077: Fix Fast Add framework to pass test
This patch fixes tab location for FA frameworks.
Not all subfields belongs to tab 0.
To test:
1) On current master, with default and fasadd fw loaded,
go to Home > Administration > MARC bibliographic framework test
it fails
2) Apply the patch
3) Delete all fw, reload all, or just default (bib & auth) and
fast add
4) Repeat 1, now test must pass
This is only on master, so no need to database update.
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as advertised. MARC bibliographic framework test passed Ok.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit c104977582f2791c99f6e0bed031d7585a4e5125
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Thu Oct 29 13:48:20 2015 -0300
Bug 15072: (followup) fix spaces and consistency
This patch add a few spaces when required and
adds layout_id on title and breadcrumbs (for patroncards)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 0ba3676df311615aac81dd45107241295a5a333b
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Oct 27 15:22:09 2015 -0300
Bug 15072: (followup) Use 'New' on Patron card creator too
This patch makes the change on the patron cards creator tool too.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
All patches without errors.
More consistent view.
A few spaces and a little fix in followup
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit aa6eed42dab6b1e1e30b29e231f82778d54160ad
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Oct 27 15:20:19 2015 -0300
Bug 15072: (followup) We use 'New' instead of 'Create' on the UI
This patch makes the UI show 'New' instead of 'Create' so it matches
the buttons, and the common practice on the UI.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 0d8de48bf56ae977cff2d0cee3fee62d3fc632a4
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Oct 27 15:15:16 2015 -0300
Bug 15072: Breadcrumbs and titles inconsistent in Label creator
This patch makes the page title and breadcrumbs more consistent.
It does so by removing some text (Manage...) and using Edit (id) and Create
on building both the breadcrumbs and titles.
To test:
- Traverse all the Label creator options
=> FAIL: the texts are not consistent and don't match what we use in the patron card creator.
- Apply the patch
=> SUCCESS: Terminology is consistent, titles and breadcrumbs show the same information
- Sign off :-D
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 9b9b966cb164d0e23c7cd84fae4daac12c1d57d9
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Mon Oct 26 12:01:51 2015 -0300
Bug 15053: Fix fr-FR, ru-RU and uk-UK sample creator data
Fixes other sample creators data
To test:
1 ) Apply the patch
2) Remove sample creator date
delete from creator_layouts; delete from creator_templates; delete from printers_profile
3) Load fr-FR/2-Optionel/sample_labels.sql
or ru-RU/optional/print_labels.sql
or uk-UA/optional/print_labels.sql
Without the patch this files can't be loaded
Test all of them
In case of ru and uk I removed a patron card layout
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 912e13629698ca12684e834093c7e48598a338ac
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Oct 23 10:10:38 2015 -0400
Bug 15053: sample_creator_data.sql now fails during a fresh install
ERROR 1136 (21S01) at line 6: Column count doesn't match value count at row 1
Test Plan:
1) Start fresh install
2) Install all test data
3) Note the SQL error
4) Apply this patch
5) Repeat steps 1 and 2
6) Note no error
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
All fixed files loads without problem.
No errors found
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
-----------------------------------------------------------------------
Summary of changes:
.../mysql/de-DE/optional/sample_creator_data.sql | 2 +-
.../marc21/optional/marc21_fastadd_framework.sql | 3 +-
.../data/mysql/en/optional/sample_creator_data.sql | 2 +-
.../mysql/es-ES/optional/sample_creator_data.sql | 2 +-
.../data/mysql/fr-FR/2-Optionel/sample_labels.sql | 32 +++++++--------
.../mysql/it-IT/necessari/sample_creator_data.sql | 2 +-
.../nb-NO/2-Valgfritt/sample_creator_data.sql | 2 +-
.../data/mysql/ru-RU/optional/print_labels.sql | 38 ++++++++----------
.../data/mysql/uk-UA/optional/print_labels.sql | 41 +++++++++-----------
.../prog/en/modules/labels/label-edit-batch.tt | 8 ++--
.../prog/en/modules/labels/label-edit-layout.tt | 8 ++--
.../prog/en/modules/labels/label-edit-profile.tt | 6 +--
.../prog/en/modules/labels/label-edit-template.tt | 12 +++---
.../prog/en/modules/labels/label-home.tt | 4 +-
.../prog/en/modules/labels/label-manage.tt | 16 +++++++-
.../prog/en/modules/patroncards/edit-batch.tt | 4 +-
.../prog/en/modules/patroncards/edit-layout.tt | 4 +-
.../prog/en/modules/patroncards/edit-profile.tt | 4 +-
.../prog/en/modules/patroncards/edit-template.tt | 4 +-
.../prog/en/modules/patroncards/manage.tt | 1 +
labels/label-manage.pl | 18 ++++++---
tools/import_borrowers.pl | 5 ++-
22 files changed, 116 insertions(+), 102 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list