[koha-commits] main Koha release repository branch master updated. v3.18.00-417-g66c9e7a
Git repo owner
gitmaster at git.koha-community.org
Sat Mar 7 22:10:23 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 66c9e7a183e8e56c29b34e57d6c3c0b3cee09699 (commit)
via 9b56ae7627b8ceb1a1fa40f33a111607095fafa3 (commit)
via 6004b2492bc945739fd95bb55955ca1fe3f0483b (commit)
via 1858f90bc2a76a7ae5afda302ed202bfe9772f7f (commit)
via 34b09f258df617e1e15b9ac8811297e79d2a58bb (commit)
via bafceab9bd3fdc140b729b8adb67540a1a62effc (commit)
via d3405211be867483fdda50c6982af5dc411858f1 (commit)
via 1bd8f5e6f783c8dfec2c53c2cc277506202ca2f7 (commit)
via ee3c31076b93eb2a724bd3a62e6f9f5c750cff72 (commit)
via 77809ccd32de48c0946b1451392021d9a67180e6 (commit)
via f71f1ba6e23b7b3777ba2ea5d531bc2cf25da140 (commit)
via dad48bcf0a7e495fe68eab37198e2c40cdbe52bf (commit)
via 92656844d89c37447947cdeaec1361a9ddadbdce (commit)
via d9d0ea3904d4aa3b7498a3c0f4516bd497b59f8b (commit)
via ad898e811c6b0c04f7e0993da1b3722bc1fee00b (commit)
via fd4f8f136029e6ccda501c2dfc3e82b1f43b6217 (commit)
via 15dd5e99432450597b3b29f975b1ad8c5c6ffdc1 (commit)
via 008d0b3438c74659f0115d63f29432b1e82853ad (commit)
via 9702bf1211bfc2fb20781b2d7bc16f62116158c5 (commit)
via cee9f08bcb34a077c8a57d05e69629087e4b5e36 (commit)
via 1ca9adaa56ff809a76ff903bb231175d0195163c (commit)
from 07e6ddc44af5ba6cdcccbcdac44bba223d891610 (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 66c9e7a183e8e56c29b34e57d6c3c0b3cee09699
Author: Marc Véron <veron at veron.ch>
Date: Wed Feb 18 20:09:57 2015 +0100
Bug 11400 - Follow-up for nicer design
This patch tries to get the Bug out of "In discussion" by changing the design a little bit.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 9b56ae7627b8ceb1a1fa40f33a111607095fafa3
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Dec 16 10:47:16 2013 -0300
Bug 11400: Show "Log in as a different user" in the error message instead of the "Logout" button
Bug 11146 introduced a way to go back, and have a logout link for the
"Not enough permissions" message page. I belive the logout button is redundant. And
also "Log in as a different user" tells the user more about its options on the scenario.
Simple and disputable usability/string change.
Regards
To+
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 6004b2492bc945739fd95bb55955ca1fe3f0483b
Author: Marc Véron <veron at veron.ch>
Date: Tue Mar 3 11:49:29 2015 +0100
Bug 13351 - Untranslatable javascript in members.tt
This patch streamlines the page title text for search results in Home > Patrons to make it translateable (and more readable).
To test:
- Apply patch
- Select Englsh language
- Apply filter wit several values or click on a letter for "Browse by last name"
- Verify that the title makes sense
- Translate to your language and select this language
- Verify that the text appears properly in your language
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described, no problems found.
http://bugs.koha-community.org/show_bug.cgi?id=13352
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 1858f90bc2a76a7ae5afda302ed202bfe9772f7f
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Mar 6 11:05:13 2015 +0100
Bug 7143: Add "developer" for all devs
Some were missing.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 34b09f258df617e1e15b9ac8811297e79d2a58bb
Author: Nicole <nicole at bywatersolutions.com>
Date: Thu Mar 5 01:32:25 2015 -0800
BUG 7143: Add Kyle Hall as the 42nd developer to history
I found Kyle's first commit and added him to the history
http://lists.gnu.org/archive/cgi-bin/namazu.cgi?query=kyle&submit=Search!&idxname=koha-cvs&max=20&result=normal&sort=date%3Aearly
While in there I added tags to releases and developers that were missing.
To test:
* Log in to staff client
* visit about koha
* check to make sure timeline is right
Signed-off-by: Larry Baerveldt <larry at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit bafceab9bd3fdc140b729b8adb67540a1a62effc
Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
Date: Mon Jun 23 16:51:00 2014 +0200
Bug 12631: Inventory: fix "wrong place" and "item not scanned"
"item not scanned": when calling GetItemsForInventory, datelastseen should
be used when "compare barcodes list to result" is checked.
Otherwise, when loading multiple barcodes files for the same inventory, many
items will be marked as "item not scanned" when loading the last barcode file
("compare barcodes list to result" checked) even though they were scanned.
"wrong place": when searching for wrongly placed items, we should only check
for the location (callnumbers, location and branch). To fix this, A new call
to GetItemsForInventory has been made with location filters only.
Otherwise, any item with a different itemtype for instance will be marked as
wrong place even if the location is correct.
Test plan:
"item not scanned" status:
1) Split a barcode file in two.
2) Load the first barcode file without checking "compare barcodes list to result".
3) Load the second barcode file with "compare barcodes list to result" checked.
4) Check in the csv report that you have a lot of scanned items with the "item
not scanned" status.
Then apply the patch, do the same, and check that the false "item not scanned"
statuses are gone.
"wrong place" status:
1) Load a barcode file with barcode matching an item that has a correct
location, but a different itemtype than what you're looking for.
2) Check in the results that this item will be marked as "change item status"
and "wrong place".
Then apply the patch, do the same, and check that the only status for this item is "change item status", which is correct.
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit d3405211be867483fdda50c6982af5dc411858f1
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Feb 25 12:24:20 2015 +0100
Bug 13750: Fix capitalization All vs ALL
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 1bd8f5e6f783c8dfec2c53c2cc277506202ca2f7
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Feb 22 11:50:21 2015 +0100
Bug 13750: Holds queue - Show branch name instead of branch code
When the holds queue report is limited to one library, it shows
<cound> items found for <branchcode>
With the patch applied, the branch name is shown instead of the code.
To test:
- Go to circulation > Holds queue
- Limit to one branch with holds waiting to be processed
- Confirm the string has changed to show the branch name
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit ee3c31076b93eb2a724bd3a62e6f9f5c750cff72
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Sat Mar 7 21:35:36 2015 +0100
Bug 13784: (QA followup) allow running Zebra for disabled instances on packages
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 77809ccd32de48c0946b1451392021d9a67180e6
Author: Larry Baerveldt <larry at bywatersolutions.com>
Date: Tue Mar 3 05:49:57 2015 -0800
Bug 13784: koha-stop-zebra should also work for disabled instances
Currently koha-stop-zebra will not stop zebra for disabled instances. It should
work more like koha-stop-sip, which does work for disabled instances. Also,
koha-stop-zebra is called by '/etc/init.d/koha-common stop' which clearly
should also apply to disabled instances.
To Test:
1) Disable a koha instance.
2) Run koha-stop-zebra INSTANCE. You should get message
"Instance INSTANCE disabled. No action taken."
3) Apply patch, and copy patched file debian/scripts/koha-stop-zebra
to package site over /usr/sbin/koha-stop-zebra.
4) Disable koha instance.
5) Run koha-stop-zebra INSTANCE. It should now stop zebra.
http://bugs.koha-community.org/show_bug.cgi?id=13784
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit f71f1ba6e23b7b3777ba2ea5d531bc2cf25da140
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue Mar 3 19:28:44 2015 -0500
Bug 13787 - Clean up noisy opac-advsearch warnings
While testing bug 10937, there were noisy warnings, which
distracted from testing the functionality of it.
Here is a snippet of the after the patch warnings:
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 384.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 161.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 161.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 177.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 177.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 202.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 202.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 240.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 240.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 256.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 256.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 356.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 356.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 369.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 369.
Tweaking the [% IF %] statements eliminated the warnings.
TEST PLAN
---------
1) Apply patch
2) Run koha qa test tools.
-- there will be noisy warnings in the before processing, but
there will be no such messages in the after processing.
3) git diff origin/master
-- there should be no visible typos.
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
- Applied the patch from bug 10937
- Ran "koha-qa.pl -c 1" and observed the warnings described in the
commit message
- Applied the patch from this bug
- Ran "koha-qa.pl -c 1" again and saw no warnings
- Ran "koha-qa.pl -c 2" and saw no warnings
I have not tested the functionality of 10937 with this patch, just verified
that the changes look sensible.
This patch feels more like a followup for 10937, than a separate patch,
especially since 10937 is just "signed off" at this time. But as long as it
works...
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit dad48bcf0a7e495fe68eab37198e2c40cdbe52bf
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Feb 21 20:40:31 2015 +0100
Bug 13744: Fix datatables paging on 'Holds to pull' report
The paging of the datatables on the 'holds to pull' report
page is broken without this patch.
To test:
- Make sure that some holds are placed on available items
in your installation
- Go to the circulation start page
- Open the 'holds to pull' report
- Verify that the patch fixes the paging on the result table
Also: Fixes "None" in the filter pull downs to be translatable.
Signed-off-by: Nicole <nicole at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 92656844d89c37447947cdeaec1361a9ddadbdce
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Feb 22 11:10:59 2015 +0100
Bug 13744: Fix datatables paging on 'checkout history' page
The paging in the datatable on the 'circulation history' page
is broken without this patch.
/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=...
To test:
- Search for a record with items that have been checked out
in the past
- From the detail page, open the 'checkout history' tab
- Check paging displays correctly with this patch and is
broken without
Signed-off-by: Nicole <nicole at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit d9d0ea3904d4aa3b7498a3c0f4516bd497b59f8b
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Feb 21 20:30:07 2015 +0100
Bug 13744: Fix datatables paging on 'order from subscription' page
The paging of the datatable on the 'order from subscription' page
is broken without this patch.
To test:
- Make sure you have a subscription, note the vendor
- Create a new basket for this vendor
- Add a new order line 'from a subscription'
- Check paging on the result table displays correctly
Signed-off-by: Nicole <nicole at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit ad898e811c6b0c04f7e0993da1b3722bc1fee00b
Author: Nicole <nicole at bywatersolutions.com>
Date: Thu Mar 5 02:03:43 2015 -0800
Bug 13771: Update manage staged marc help for 3.18
This updates the manage staged marc files help.
To test:
* Visit Tools > Staged MARC record management
* Click help
* Confirm it's there and correct
Signed-off-by: Larry Baerveldt <larry at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit fd4f8f136029e6ccda501c2dfc3e82b1f43b6217
Author: Nicole <nicole at bywatersolutions.com>
Date: Wed Mar 4 07:47:54 2015 -0800
Bug 13771: Add missing item search help file
This patch adds a help file for the staff item search.
To test:
* Click search
* click item search
* click help
* review the help file
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 15dd5e99432450597b3b29f975b1ad8c5c6ffdc1
Author: Nicole <nicole at bywatersolutions.com>
Date: Tue Mar 3 02:01:56 2015 -0800
Bug 13771: Add admin help files for 3.18
This patch adds a new help file for column settings and updates the
files for budgets, funds, libraries, patron categories, and circ rules.
To test:
* Visit the above listed admin pages
* Review help files
Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 008d0b3438c74659f0115d63f29432b1e82853ad
Author: Nicole <nicole at bywatersolutions.com>
Date: Mon Mar 2 07:48:12 2015 -0800
Bug 13771: Update Circ Help File
This updates the main circulation help file with new features in 3.18.
To test:
* visit circulation page
* click help
* review text
Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 9702bf1211bfc2fb20781b2d7bc16f62116158c5
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date: Mon Mar 2 04:49:30 2015 -0500
Bug 13771: Main Page Help fro 3.18
This updates the main page help file for 3.18.
To test:
* Log in to staff cleint
* Click help on the mian page
* Review help file
Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit cee9f08bcb34a077c8a57d05e69629087e4b5e36
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date: Mon Mar 2 05:28:42 2015 -0500
BUG 13771: Update Tools Help Files for 3.18
This patch creates a helpf ile for the batch record delete tool
and updates the help files for notices and marc export.
To test:
* Visit tools > batch record deletion
* confirm help is right
* Visit tools > Notices & Slips
* confirm help is right
* Visit tools > export marc
* cofirm the help is right
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 1ca9adaa56ff809a76ff903bb231175d0195163c
Author: Dobrica Pavlinusic <dpavlin at rot13.org>
Date: Wed Mar 4 11:38:42 2015 +0100
Bug 13789 - facets with accented utf-8 characters generate double encoded links
Bug 13425 tried to fix XSS in OPAC, by using url filter in template toolkit
on whole generated url. This doesn't work and create double encoded strings
in facets because we are creating url variable by concatenating query_cgi
(which did pass through uri_escape_utf8 on perl side) and other
parameters which have to be escaped in template.
Also, code like
[% SET limit_cgi_f = limit_cgi | url %]
doesn't do anything (at least doesn't apply url filter) so it's not needed.
This patch also fixes encoding of hidden fields used in sort by form.
And lastly, it tries to make facet changes for opac and intranet as same as
possible to simplify future maintencence of this code.
Test scenario:
1. find results in your opac which contain accented characters
2. click on them and verify that results are missing
3. apply this patch
4. re-run search and click on facets link verifying that there are
now results
5. test sort by form and verify that results are ok
6. verify that facets are still safe from injection by constructing url like
/cgi-bin/koha/opac-search.pl?q=123&sort_by='"><script>prompt('Happy_Holidays')</script>&limit=123
and verifying that you DON'T see prompt window in your browser
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
catalogue/search.pl | 5 +-
debian/scripts/koha-restart-zebra | 19 +-
debian/scripts/koha-start-zebra | 12 +-
debian/scripts/koha-stop-zebra | 12 +-
docs/history.txt | 471 ++++++++++----------
.../intranet-tmpl/prog/en/includes/facets.inc | 14 +-
.../prog/en/modules/acqui/newordersubscription.tt | 3 +-
koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 10 +-
.../prog/en/modules/catalogue/issuehistory.tt | 3 +-
.../prog/en/modules/circ/pendingreserves.tt | 5 +-
.../prog/en/modules/circ/view_holdsqueue.tt | 2 +-
.../prog/en/modules/help/admin/aqbudgetperiods.tt | 50 ++-
.../prog/en/modules/help/admin/aqbudgets.tt | 30 +-
.../prog/en/modules/help/admin/branches.tt | 40 +-
.../prog/en/modules/help/admin/categorie.tt | 1 +
.../prog/en/modules/help/admin/columns_settings.tt | 17 +
.../prog/en/modules/help/admin/smart-rules.tt | 15 +-
.../prog/en/modules/help/catalogue/itemsearch.tt | 15 +
.../prog/en/modules/help/circ/circulation.tt | 23 +-
.../intranet-tmpl/prog/en/modules/help/mainpage.tt | 16 +-
.../en/modules/help/tools/batch_delete_records.tt | 15 +
.../prog/en/modules/help/tools/export.tt | 2 +
.../prog/en/modules/help/tools/letter.tt | 1 -
.../en/modules/help/tools/manage-marc-import.tt | 1 +
.../prog/en/modules/members/member.tt | 13 +-
.../bootstrap/en/includes/opac-facets.inc | 11 +-
.../bootstrap/en/modules/opac-advsearch.tt | 23 +-
opac/opac-search.pl | 3 +-
tools/inventory.pl | 12 +-
29 files changed, 493 insertions(+), 351 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/columns_settings.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/itemsearch.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/batch_delete_records.tt
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list