[koha-commits] main Koha release repository branch master updated. v3.20.00-782-g6506ddd
Git repo owner
gitmaster at git.koha-community.org
Mon Oct 19 15:14:26 CEST 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 6506ddd1e859c3afbb9519d6a956495c06d628ce (commit)
via cab481dbb29fa4b72c0e52dd4dd9e20aebdbc7eb (commit)
via de8076157ef0bac30e01e8ea8b723ce439663221 (commit)
via 4c10a8fb7567b5d7a39fa7c1663240148a99add1 (commit)
via d78d6c87ea416f266d2d22bc7a201875d4cb2a2a (commit)
via 4d6e901968814327d74f2ed094d32ceb78613a91 (commit)
via 201726fae64cf57f2b7ad9690ecee161c9f19ab3 (commit)
via a3b4b33e4690fa805c13b8f6277ac78facad3919 (commit)
via 8d70ea948717325212501d8a301ebff93f4ecd17 (commit)
via 02492bd6eadadcf67e173f3d219b2f5aa895371b (commit)
via 6c30d31af7b7d0e0a7c405d85cddcdf4651c4dbf (commit)
via 5fd30dc5f2d20b57eb944887e571b179466da41c (commit)
via 912f238c5e4efa275e74cde77de184473e1f2dd7 (commit)
from 390233a10c789a241f948f0f41df92fda3e51052 (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 6506ddd1e859c3afbb9519d6a956495c06d628ce
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Oct 9 09:14:33 2015 +0100
Bug 14990: Format the date template-side for moremember
Test plan:
print slip and show the member detail page, the 3 dates date of birth,
date enrolled and date of expiry should be displayed correctly.
Followed test pan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit cab481dbb29fa4b72c0e52dd4dd9e20aebdbc7eb
Author: Barton Chittenden <barton at bywatersolutions.com>
Date: Tue Oct 6 06:22:56 2015 -0700
Bug 14617: Add fields to ISBN and ISSN indexes: 020$z, 022$y, 022$z
1) Import MARC21 bibs containing
- ISBN in 020$z
- ISSN in 022$y
- ISSN in 022$z
2) Make sure that bibs are indexed
3) Search by ISBN and ISSN above -- bibs should not show in search.
4) Apply patch, re-index
5) Search again; ISBN in 020$z and ISSN in 022$y and 022$z should return
results.
Signed-off-by: kholten at switchinc.org
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit de8076157ef0bac30e01e8ea8b723ce439663221
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Oct 9 09:25:30 2015 +0100
Bug 14926: Format the date according to the dateformat syspref
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as advertised. Tested with the three values from dateformat syspref
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 4c10a8fb7567b5d7a39fa7c1663240148a99add1
Author: Marc Véron <veron at veron.ch>
Date: Tue Sep 29 18:42:06 2015 +0200
Bug 14926: Remove C4::Dates from members/printfeercpt.pl
This patch removes C4::Dates from members/printfeercpt.pl
To test:
- Go to a patron's fines (members/boraccount.pl) and make sure that
he/she has made a payment
- Select 'Print' in the payment's line
- Verify that the payment date on the slip displays correctly
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as advertised. Date displayed 2015-10-08
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit d78d6c87ea416f266d2d22bc7a201875d4cb2a2a
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Oct 18 11:56:04 2015 +0200
Bug 13632: QA follow-up: Tidy installer directories / update permissions.inc
- removes permission related text files from translated
web installer directories
- updates the permissions.inc file to include the newest
permission 'self_checkout'
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 4d6e901968814327d74f2ed094d32ceb78613a91
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 22 09:51:04 2015 +0100
Bug 13632: Remove specific files
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 201726fae64cf57f2b7ad9690ecee161c9f19ab3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 22 09:50:15 2015 +0100
Bug 13632: Populate user_flags and permissions tables in the web installer
Move the 2 specific 'en' files outside of the language directory.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit a3b4b33e4690fa805c13b8f6277ac78facad3919
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 22 09:48:27 2015 +0100
Bug 13632: Do not use userflags.flagdesc and permissions.description
These 2 fields are not used anymore, but we want to keep them anyway.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 8d70ea948717325212501d8a301ebff93f4ecd17
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 22 09:47:25 2015 +0100
Bug 13632: Use an include file to display permissions
This patch set moves the permissions' descriptions to the po files
instead of having them in the DB.
Test plan:
0/ Apply all patches
1/ Create a new installation
2/ Confirm the userflags and permissions tables are correctly populated
3/ Update the po file for a translated language
4/ Confirm you are able to translate the permissions descriptions
5/ Install the template files for this language
6/ Switch the interface to use this language and confirm the string are
correctly translated.
QA Note: At this point we could remove the userflags.flagdesc and
permissions.description DB fields, but I would prefer to keep them:
developers will know what the permission do without the need to go and
see the include file (we have it in the sql files and so, in the DB).
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 02492bd6eadadcf67e173f3d219b2f5aa895371b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Oct 16 08:05:46 2015 +0000
Bug 15005: Replace $ENV{SCRIPT_NAME} with the hardcoded script paths
Since I don't manage to make SCRIPT_NAME works directly with RequestHeader and/or
ReverseProxyPath, the easier way it to fix all the different occurrences.
Test plan:
On the import patrons page, confirm that the "Import" button does not redirect to a 'Not found' page.
You should stay on the import patrons page.
Note that if this change works, all others should work too.
Have a look at the diff of this patch and confirm there is no typo.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Tested in patron import and item batch modification
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 6c30d31af7b7d0e0a7c405d85cddcdf4651c4dbf
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 13 15:51:29 2015 +0000
Bug 15005: Fix pagination_bar calls
Test plan:
Create an order for an existing biblio, confirm that the pagination links work correctly.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 5fd30dc5f2d20b57eb944887e571b179466da41c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 13 15:38:54 2015 +0000
Bug 15005: Remove CGI->url calls from pl scripts
Same as previous patch for calls in pl scripts.
Test plan:
- delete an entry of your search history from intranet and opac
- with IndependentBranches=OFF, go on the waiting holds and confirm that the
link next to 'Holds awaiting pickup for your library on' is correct.
- search for items, the pagination should work correctly
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 912f238c5e4efa275e74cde77de184473e1f2dd7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 13 14:56:10 2015 +0000
Bug 15005: Replace CGI->url with the corresponding url
CGI->url does not return the correct url on install using packages.
Test plan:
1/ Try to reproduce the bug from the description of bug 15005.
You should be able to login to the intranet and the OPAC
2/ Send a basket and a list from the intranet and the OPAC.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 6 +-
C4/InstallAuth.pm | 2 -
C4/Installer.pm | 2 +
C4/Output.pm | 2 +-
acqui/neworderbiblio.pl | 2 +-
catalogue/itemsearch.pl | 2 +-
catalogue/search-history.pl | 3 +-
circ/waitingreserves.pl | 2 +-
.../marc21/biblios/biblio-koha-indexdefs.xml | 12 +++
.../marc21/biblios/biblio-zebra-indexdefs.xsl | 21 ++++
installer/data/mysql/de-DE/mandatory/userflags.sql | 19 ----
installer/data/mysql/de-DE/mandatory/userflags.txt | 1 -
.../data/mysql/de-DE/mandatory/userpermissions.sql | 78 ---------------
.../data/mysql/de-DE/mandatory/userpermissions.txt | 1 -
installer/data/mysql/en/mandatory/userflags.txt | 1 -
.../data/mysql/en/mandatory/userpermissions.txt | 1 -
installer/data/mysql/es-ES/mandatory/userflags.sql | 19 ----
installer/data/mysql/es-ES/mandatory/userflags.txt | 1 -
.../data/mysql/es-ES/mandatory/userpermissions.sql | 78 ---------------
.../data/mysql/es-ES/mandatory/userpermissions.txt | 1 -
.../data/mysql/fr-FR/1-Obligatoire/userflags.sql | 21 ----
.../data/mysql/fr-FR/1-Obligatoire/userflags.txt | 1 -
.../mysql/fr-FR/1-Obligatoire/userpermissions.sql | 78 ---------------
.../mysql/fr-FR/1-Obligatoire/userpermissions.txt | 1 -
installer/data/mysql/it-IT/necessari/userflags.sql | 23 -----
installer/data/mysql/it-IT/necessari/userflags.txt | 1 -
.../data/mysql/it-IT/necessari/userpermissions.sql | 78 ---------------
.../data/mysql/it-IT/necessari/userpermissions.txt | 1 -
.../data/mysql/nb-NO/1-Obligatorisk/userflags.sql | 40 --------
.../data/mysql/nb-NO/1-Obligatorisk/userflags.txt | 1 -
.../mysql/nb-NO/1-Obligatorisk/userpermissions.sql | 98 ------------------
.../mysql/nb-NO/1-Obligatorisk/userpermissions.txt | 1 -
installer/data/mysql/pl-PL/mandatory/userflags.sql | 20 ----
installer/data/mysql/pl-PL/mandatory/userflags.txt | 1 -
.../data/mysql/pl-PL/mandatory/userpermissions.sql | 78 ---------------
.../data/mysql/pl-PL/mandatory/userpermissions.txt | 1 -
.../ru-RU/mandatory/permissions_and_user_flags.sql | 105 --------------------
.../ru-RU/mandatory/permissions_and_user_flags.txt | 1 -
.../uk-UA/mandatory/permissions_and_user_flags.sql | 104 -------------------
.../uk-UA/mandatory/permissions_and_user_flags.txt | 1 -
.../data/mysql/{en/mandatory => }/userflags.sql | 0
.../mysql/{en/mandatory => }/userpermissions.sql | 0
.../intranet-tmpl/prog/en/includes/permissions.inc | 104 +++++++++++++++++++
koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 2 +-
.../prog/en/modules/basket/sendbasketform.tt | 2 +-
.../prog/en/modules/installer/auth.tt | 2 +-
.../prog/en/modules/members/member-flags.tt | 5 +-
.../prog/en/modules/members/moremember-brief.tt | 9 +-
.../prog/en/modules/members/moremember.tt | 10 +-
.../prog/en/modules/members/printfeercpt.tt | 3 +-
.../en/modules/virtualshelves/sendshelfform.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 2 +-
.../bootstrap/en/modules/opac-sendbasketform.tt | 2 +-
.../bootstrap/en/modules/opac-sendshelfform.tt | 2 +-
members/member-flags.pl | 9 +-
members/moremember.pl | 4 +-
members/printfeercpt.pl | 5 +-
offline_circ/process_koc.pl | 4 +-
opac/opac-search-history.pl | 6 +-
tools/batchMod.pl | 4 +-
tools/batch_record_modification.pl | 4 +-
tools/import_borrowers.pl | 2 +-
tools/manage-marc-import.pl | 4 +-
tools/showdiffmarc.pl | 2 +-
tools/stage-marc-import.pl | 6 +-
65 files changed, 190 insertions(+), 914 deletions(-)
delete mode 100644 installer/data/mysql/de-DE/mandatory/userflags.sql
delete mode 100644 installer/data/mysql/de-DE/mandatory/userflags.txt
delete mode 100644 installer/data/mysql/de-DE/mandatory/userpermissions.sql
delete mode 100644 installer/data/mysql/de-DE/mandatory/userpermissions.txt
delete mode 100644 installer/data/mysql/en/mandatory/userflags.txt
delete mode 100644 installer/data/mysql/en/mandatory/userpermissions.txt
delete mode 100644 installer/data/mysql/es-ES/mandatory/userflags.sql
delete mode 100644 installer/data/mysql/es-ES/mandatory/userflags.txt
delete mode 100644 installer/data/mysql/es-ES/mandatory/userpermissions.sql
delete mode 100644 installer/data/mysql/es-ES/mandatory/userpermissions.txt
delete mode 100644 installer/data/mysql/fr-FR/1-Obligatoire/userflags.sql
delete mode 100644 installer/data/mysql/fr-FR/1-Obligatoire/userflags.txt
delete mode 100644 installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
delete mode 100644 installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.txt
delete mode 100644 installer/data/mysql/it-IT/necessari/userflags.sql
delete mode 100644 installer/data/mysql/it-IT/necessari/userflags.txt
delete mode 100644 installer/data/mysql/it-IT/necessari/userpermissions.sql
delete mode 100644 installer/data/mysql/it-IT/necessari/userpermissions.txt
delete mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/userflags.sql
delete mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/userflags.txt
delete mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
delete mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.txt
delete mode 100644 installer/data/mysql/pl-PL/mandatory/userflags.sql
delete mode 100644 installer/data/mysql/pl-PL/mandatory/userflags.txt
delete mode 100644 installer/data/mysql/pl-PL/mandatory/userpermissions.sql
delete mode 100644 installer/data/mysql/pl-PL/mandatory/userpermissions.txt
delete mode 100644 installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql
delete mode 100644 installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.txt
delete mode 100644 installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql
delete mode 100644 installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.txt
rename installer/data/mysql/{en/mandatory => }/userflags.sql (100%)
rename installer/data/mysql/{en/mandatory => }/userpermissions.sql (100%)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list