[koha-commits] main Koha release repository branch master updated. v3.18.00-277-g011d8e9
Git repo owner
gitmaster at git.koha-community.org
Mon Feb 9 17:39:01 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 011d8e9855ffeb1779f5c1aadc9f4367c298cee7 (commit)
via 09edfe8d53f91d150c39be9ec41bc24c82ce93dd (commit)
via 983f49d7b28e3bf65c799f7ff00d64bdb10429d0 (commit)
via 6a68ac3e5ded2e56d9b9de8f6e1a6a9ed49ac327 (commit)
via b6aae39c263eee482aaeb574c206fa0c2c69f120 (commit)
via bc355fef2455b7b22c29a061db72d07046169738 (commit)
via 945a0f09e73606907d6df72b873e478cc6763c14 (commit)
via 381de54ed1f56f61f22a682147b67d3902f43604 (commit)
via f70ad43f8fd49ad7fb43697c6953767e534f7368 (commit)
via 58f7f56b8664810335f60f3fe5e43faa079f33bc (commit)
via 28af6c4d01e0b1a31dece34031b6379fb9befebc (commit)
via 12eb3cb440b254c06d9fdb6026bca52d058dfb59 (commit)
via 926e97b9e94fede770c55e01c042b157ce9c22af (commit)
via 273ead3084e7d3d573d89b80739a4dacd4f07044 (commit)
via fe66114e210885324eb37773e2bd09e7e2190f59 (commit)
via e2bbdc0b145fba30bd60110ad2d4fd8262107947 (commit)
from e5b834a1c474f761c9f9c8c01dd6abeb99ee5eac (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 011d8e9855ffeb1779f5c1aadc9f4367c298cee7
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jul 8 10:30:00 2014 -0400
Bug 12543 - Add userid as matchpoint for "Import patrons" tool
The a patron's userid should be a matchpoint in the same manner as
cardnumber. Though not enforced as a unique key by the database yet
( pending bug 1861 ), this field is effectively unique as uniqueness
is enforced by Koha itself.
Test Plan:
1) Apply this patch
2) Browse to tools/import_borrowers.pl
3) Download the starter CSV file
4) Edit the csv file to include 1 or more patrons
* Make sure to leave the borrowernumber field empty
* Make sure the userid field matches the patrons you wish to overwrite
5) From import_borrowers.pl, upload your file
* Set "Field to use for record matching" to "Username"
* Set "If matching record is already in the borrowers table" to "Overwrite the existing one with this"
6) Click "Import"
7) Verify the patrons in your file have been updated in Koha
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
Do exactly what's announced. This may help.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 09edfe8d53f91d150c39be9ec41bc24c82ce93dd
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Feb 9 09:26:04 2015 +0100
Bug 13404: [QA Follow-up] Minor rewording of some warnings
Changes are confirmed with author (Mirko Tietgen). See Bugzilla.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 983f49d7b28e3bf65c799f7ff00d64bdb10429d0
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Jan 1 21:06:58 2015 -0500
Bug 13404 [QA Followup]
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 6a68ac3e5ded2e56d9b9de8f6e1a6a9ed49ac327
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Sun Dec 7 18:39:51 2014 +0100
Bug 13404 - More System information about GRS1 vs DOM settings
System information indicates missing <zebra_bib_index_mode> and <zebra_auth_index_mode> entries in koha-conf.xml.
This patch
- adds warnings about a possible mismatch between these settings and the actual setup
- adds info about the actual setup/what values to use for <zebra_bib_index_mode> and <zebra_auth_index_mode> if they are not set.
The assumption is that a path including 'zebra-*-dom.cfg' in the respective section indicates a DOM setup.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit b6aae39c263eee482aaeb574c206fa0c2c69f120
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Dec 5 15:50:05 2014 +0100
Bug 13401 - sort branches alphabetically in admin/authorised_values.pl
This patch adds a sort of branches alphabetically by name in authorised values administration, like in many other pages.
Also replaces var $branch (too ambigus) by $branchcode.
Test plan :
- Create 2 branches : code=AAA,name=Zbranch and code=ZZZ,name=Abranch
- Create a new authorized value : admin/authorised_values.pl
- Look at "Libraries limitation" :
=> Without patch branches are sorted by code : Zbranch then Abranch
=> Without patch branches are sorted by name : Abranch then Zbranch
- Select a branch and save
- Re-edit
=> Check the same branch is selected
Followed test plan. Patch behaves as expected.
Signed-off-by: Marc Veron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit bc355fef2455b7b22c29a061db72d07046169738
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Feb 8 16:23:41 2015 +0100
Bug 13352: QA Follow-up: Remove Price filter from "Warning at (%)"
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 945a0f09e73606907d6df72b873e478cc6763c14
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Jan 26 10:28:27 2015 +0100
Bug 13352: On editing, prices should not be formatted
Bug 12979 refactored the way to display prices.
The price format configuration was duplicated everywhere it was used.
All calls looks good except the one in admin/aqbudgetperiods.pl
In this one, the prices are formatted for an edition field (input).
This means the input is incorrectly filled even if the user does not
update the field.
At the end, maybe should we manage formatted prices everywhere, even in
inputs, but it's not in the scope of this bug.
Technically, a new subroutine format_for_editing is added to the
Koha::Number::Price module.
It should be called everywhere a price is displayed in an input field.
At the moment, it only does a sprintf("%.2f"), but it is a first step to
let the number of decimals to display configurable.
To test:
1/ Verify the issue described is fixed (editing a budget with a total
amount > 1000 (With CurrencyFormat is US or FR).
2/ Verify you can edit a fund with a total amount > 1000
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 381de54ed1f56f61f22a682147b67d3902f43604
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Feb 9 13:32:50 2015 -0300
Bug 13602: (QA followup) take advantage of the defined-or operator
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit f70ad43f8fd49ad7fb43697c6953767e534f7368
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed Jan 14 17:00:17 2015 +0100
Bug 13562: Fix item search on item MARC subfields
Test plan:
1. Add 4 item search fields (in Administration › Items search fields):
a. 1 biblio field linked to a DB field
b. 1 biblio field not linked to a DB field
c. 1 item field linked to a DB field
d. 1 item field not linked to a DB field
2. Make sure you have some data in those fields to search on.
3. Go to item search page and do a search using these new fields, make
sure the result is correct.
Signed-off-by: Nick <nick at quecheelibrary.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 58f7f56b8664810335f60f3fe5e43faa079f33bc
Author: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
Date: Tue Jan 20 16:48:13 2015 +0200
Bug 13602 - Username/password already exists when editing borrower attributes and messaging preferences
When editing a Patron's messaging preferences or borrower attributes, one cannot
save changes because 'userid' is not given as a parameter.
It shouldn't, but the
Check_Userid($newdata{'userid'},$borrowernumber) -check must have it.
REPLICATE THE ISSUE:
1. Find a Borrower.
2. Go to the details-tab.
3. Under "Patron messaging preferences" click edit to edit just the messaging
preferences.
4. Just save, no need to make any modifications.
5. Observe the error "Username/password already exists"
This happens to all/most of the sub-forms in the Borrower's Details-view.
AFTER THIS PATCH:
Check_Userid() get the $userid from the new parameters, or if not present, from
the koha.borrowers-table.
TEST FOR REGRESSION:
1. Edit a borrower normally. Notice no errors.
2. Edit a sub-form (Alternate address/Patron messaging preferences). Notice no
errors.
DISCLAIMER: You are free to steal/rip/modify/hack this patch to your soul's
extent without my permission. As long as it makes to Koha I am happy.
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 gmail.com>
commit 28af6c4d01e0b1a31dece34031b6379fb9befebc
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Jan 28 12:24:45 2015 -0500
Bug 13638 - Batch patron modification tool missing option to switch language
The batch patron modification tool's template was created without the
footer include at the bottom. Without the footer include the language
toolbar will not be displayed.
All page templates should include the global footer include:
[% INCLUDE 'intranet-bottom.inc' %]
To test:
- Install at least a second language
- Enable at least 2 languages (language system preference)
- Go to tools > Batch patron modification
- Verify that at the bottom of the page the language chooser is shown
Followed test plan. Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 12eb3cb440b254c06d9fdb6026bca52d058dfb59
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Dec 5 13:40:00 2014 +0100
Bug 13418: Clean C4::VirtualShelves::Page - Part 2
I don't understand at all the usefulness of $privshelflist and
$privtotshelves in C4::VirtualShelves::Page
They look useless.
If you deep in the git history, you will find
commit 25eb36f21fe952118327d2c84dfef5d38eee31a7
Bug #2531 Cannot delete private shelf
I am not able to reproduce this issue after this patch
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 926e97b9e94fede770c55e01c042b157ce9c22af
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jan 19 15:05:03 2015 +0100
Bug 13418: [QA Follow-up] Use unshift instead of push
Some SQL parameters are added to the wrong side of the list.
This effectively clears all private lists from view :)
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 273ead3084e7d3d573d89b80739a4dacd4f07044
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Dec 8 16:31:06 2014 +0100
Bug 13418: Clean C4::VirtualShelves::Page a bit
I tried to reuse this package for a new development, I did not manage.
It's a really hard to read and to understand.
Here my first try, this patch only remove the call to _shelf_count in
the GetShelves subroutine.
Someone might want to get this value for another reason and from
somewhere else.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit fe66114e210885324eb37773e2bd09e7e2190f59
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Jan 30 07:10:29 2015 -0500
Bug 13450 [QA Followup] - Remove tab character from start of line
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit e2bbdc0b145fba30bd60110ad2d4fd8262107947
Author: Marc Véron <veron at veron.ch>
Date: Tue Dec 30 00:04:53 2014 +0100
Bug 13450 - Title and breadcrumb of Patron form can look weird in translations
This patch moves the patron category name or category type at the end of title and breadcrumb for better translatability.
Note: It does not change anything in functionallity, it only changes display of strings.
To test:
Apply patch
Search a patron and edit it in all possible ways: 'Edit' button on top of details page, 'Edit' links in details page, 'Edit' links in search result table if multiple patrons are found)
Duplicate a patron
Create a new patron
Make sure that title and breadcrumb appear in a meaningful way with pattern similar to the following:
Modify patron Hansli Meier (Juvenile)
(Missing </div> added)
Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Items.pm | 32 +++++++++++--
C4/VirtualShelves.pm | 19 +++-----
C4/VirtualShelves/Page.pm | 38 ++++++----------
Koha/Number/Price.pm | 15 ++++++
Koha/Template/Plugin/Price.pm | 9 +++-
about.pl | 46 +++++++++++++++++++
admin/aqbudgetperiods.pl | 6 ---
admin/aqbudgets.pl | 1 -
admin/authorised_values.pl | 8 ++--
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 30 ++++++++++++
.../prog/en/modules/admin/aqbudgetperiods.tt | 7 ++-
.../prog/en/modules/admin/aqbudgets.tt | 4 +-
.../prog/en/modules/members/memberentrygen.tt | 23 ++--------
.../prog/en/modules/tools/import_borrowers.tt | 1 +
.../prog/en/modules/tools/modborrowers.tt | 5 +-
members/memberentry.pl | 7 ++-
t/Prices.t | 9 +++-
t/db_dependent/Items.t | 48 +++++++++++++++++++-
tools/import_borrowers.pl | 5 ++
19 files changed, 228 insertions(+), 85 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list