[koha-commits] main Koha release repository branch master updated. v18.05.00-129-gfa25c45
Git repo owner
gitmaster at git.koha-community.org
Fri Jun 29 23:11:01 CEST 2018
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 fa25c45ffcd2a654a258cacc133b51c60cf5ae92 (commit)
via 452c962b6e8631119d53ae776446d46b2c584f53 (commit)
via 19de2dab06f6b8d3cbc142a95af93e130a953fe9 (commit)
via addbff779ca6e5be867c83e9c0d03e5f82ad821c (commit)
via 34d42993415b46b6c6e011e9406f0c50d94a4d81 (commit)
via 037f4a2f010d8358d20956d4a9e914adb1e19034 (commit)
via 14f54d4e13bf3f0c51126a8031c5b2b05fb6d61d (commit)
via 255c484c9b9b9d92774bd17fa79e9f05dd612858 (commit)
via 7f79a9a5f8c8b2fe2c29d270264bdfa48a7056bd (commit)
via c089df3f3b45782516b63d22c34bc265c667dd35 (commit)
via 87a78e5a92b9a279e2d9c524beafddead82e0ae1 (commit)
via 3c70ac3f9f56ebf31da4151ba713a40a8abeb95b (commit)
via 894eb72addc71b1007c816d49bd807dd8983a180 (commit)
via a2993e82e90b7bde37a147a3daa868bd441c542a (commit)
via f363de477899a95cb1d7f415013ce2bca8cfb93f (commit)
via b4468f0987475c624142d96bbffd00b489ccfab0 (commit)
via 1a01c62f9dfca77df084501baa546afaa39dbe0f (commit)
via d1587c494ade1718059337f96ec12ae10bd63cf6 (commit)
via a09643ca23348009e409ae42057792224e7cbd0c (commit)
via 46d288a61caea1541e0074051f5cff9e8d6b4f6e (commit)
via fe9f7cef3be1768ec54acd7934b146d5d9d68927 (commit)
from 487e4708b312cd2de645a36cbf0f0bcb31e07d15 (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 fa25c45ffcd2a654a258cacc133b51c60cf5ae92
Author: Lee Jamison <ldjamison at marywood.edu>
Date: Wed May 30 00:26:56 2018 +0000
Bug 17153: Redirect to search when logging in from search
This patch is a fresh attempt at redirecting back to search
results after logging in on opac-search.pl
To test:
- Perform an OPAC search
- Login on opac-search.pl with the search results displayed
- The page is redirected to opac-user.pl
- Log out
- Apply the patch
- Perform a new OPAC search
- Note the URL query string
- Login on opac-search.pl with the search results displayed
- The opac-search.pl page should be displayed with the correct
query string and the page should indicate a logged in status
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Followed the test plan and the patch works.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 452c962b6e8631119d53ae776446d46b2c584f53
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jun 29 20:46:08 2018 +0000
Bug 20921: (RM follow-up) Fix QA pod errors
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 19de2dab06f6b8d3cbc142a95af93e130a953fe9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jun 25 16:48:59 2018 -0300
Bug 20921: Add selenium tests for .loggedinusername
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit addbff779ca6e5be867c83e9c0d03e5f82ad821c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jun 25 16:48:21 2018 -0300
Bug 20921: Fix opac_auth for selenium
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 34d42993415b46b6c6e011e9406f0c50d94a4d81
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Jun 12 15:57:56 2018 +0000
Bug 20921: Add borrowernumber and branchcode as html attributes
To test:
1 - Apply patch
2 - Visit the opac
3 - Sign in
4 - You should not see any difference
5 - Inspect the element 'Welcome, {username}'
6 - Note the attributes for borrowernumber and branchcode
7 - Add to OPACUserJS:
$(document).ready(function(){
console.log( $(".loggedinusername").attr('data-branchcode'));
console.log( $(".loggedinusername").attr('data-borrowernumber'));
});
8 - Check the console and note you can see the info expected
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Followed the test plan and it works.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 037f4a2f010d8358d20956d4a9e914adb1e19034
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jun 21 18:33:23 2018 +0000
Bug 20585: Label surname as name for organisation type patrons
This patch modifies the patron edit page so that the label for an
organization name is "Name" instead of "Surname."
To test, apply the patch and edit both an institutional patron and a
regular patron. Confirm that the name/surname label is correct in each
case.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 14f54d4e13bf3f0c51126a8031c5b2b05fb6d61d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Apr 4 17:50:48 2018 +0000
Bug 20520: Re-indent moremember.tt
This patch reindents the template for the patron detail page,
moremember.tt:
- Trailing spaces removed
- Indentation changed to a consistent 4 spaces
- Markup indentation made more consistent
To test, view the patron detail page. There should be no visible
difference before and after the applying the patch.
HTML validation before and after the patch should return the same
results.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 255c484c9b9b9d92774bd17fa79e9f05dd612858
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jun 25 15:55:03 2018 -0400
Bug 10348: Show number of items on tab headings in the staff client
This patch uses Template Toolkit's size() method to add a count to
the bibliographic detail page's holdings and images tabs.
To test, apply the patch and view the detail page for a record in
the staff client. Check under the following conditions:
- The SeparateHoldings system preference is set to "Don't separate"
- The holdings tab should show the correct item count.
- The SeparateHoldings system preference is set to "Separate"
- The "[Library] holdings" tab and "Other holdings" tabs should
have the correct item counts.
- With LocalCoverImages enabled the "Images" tab should show the
correct count of attached images. Test with zero or more attached
images.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7f79a9a5f8c8b2fe2c29d270264bdfa48a7056bd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jun 26 13:04:01 2018 -0300
Bug 20991: Do not lost patron's category when editing a patron
If there is an error in the edit patron form the patron's category is
lost.
This seems to be a long standing bug.
Test plan:
- Edit an existing patron
- Change the patron category to a category that triggers the error that
the user is not in the right age range for that new category
- Save, error is triggered
=> Without this patch the patron category has been reset
You should also test different ways to edit/add a patron (quick add,
step 1)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c089df3f3b45782516b63d22c34bc265c667dd35
Author: Caitlin Goodger <caitlingoodger.student at wegc.school.nz>
Date: Tue May 29 17:32:12 2018 +0000
Bug 17886: Don't show option to add to existing list if there are no lists
This patch modifies the page for adding a title to a list so that the
"Add to existing list" option doesn't appear if there are no lists
defined.
TEST PLAN
---------
1) Make sure no lists exist at all.
2) Make there is at least one findable biblio record entered
3) Find that biblio record in the OPAC
4) Click 'Save to your lists'
-- Notice that the whole save to list section is there.
5) Apply this patch
6) Click 'Cancel'
7) Click 'Save to your lists'
-- Notice you can only add now, which makes sense.
8) Run koha qa test tools.
Perform the same tests in the staff client.
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Followed the test plan and the patch works.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 87a78e5a92b9a279e2d9c524beafddead82e0ae1
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jun 21 14:32:52 2018 +0000
Bug 14222: Sort holds in OPAC by priority
This patch modifies the markup of the users's holds table in the OPAC so
that if hold priority is displayed, the table will be sorted by that
number.
To test, apply the patch and set the OPACShowHoldQueueDetails system
preference to "Show priority level" or "Show holds and their priority
level."
- Log in to the OPAC as a user who has multiple holds with various
priorities. Include priorities which could be sorted incorrectly
using a text sort, e.g. 1, 10.
- View the holds tab on the "your summary" page. Confirm that the
priority column is sorted by default with the lowest priority holds
first.
- Set the OPACShowHoldQueueDetails preference to "Show holds" and
confirm that the holds table still displays correctly, sorted by
"Placed on" ascending.
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Followed the test plan and the patch works.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3c70ac3f9f56ebf31da4151ba713a40a8abeb95b
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jun 29 20:09:38 2018 +0000
Bug 20945: (RM follow-up) Escape param_name too
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 894eb72addc71b1007c816d49bd807dd8983a180
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Jun 14 14:20:44 2018 +0000
Bug 20945: Escape SQL parameters when constructing download links
TO test:
1 - Create a report that takes a parameter
2 - Enter a parameter containing '%'
3 - Attempt to download report, note link is misconstructed
4 - Apply patch
5 - Reload
6 - Note URL is now correct
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a2993e82e90b7bde37a147a3daa868bd441c542a
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu May 3 12:33:19 2018 +0200
Bug 20697: Bind calling GetAnalyticsCount to pref EasyAnalyticalRecords
If you do not use the EasyAnalyticalRecords feature (introduced with
bug 5528), you will have a lot of warnings in zebra-output.log like:
zebrasrv(1096) [request] Search biblios ERROR 114 1 1+0 RPN @attrset Bib-1 @attr 1=8911 259186
They come from C4::Items::GetAnalyticsCount called by catalogue/detail.pl.
This sub starts a Zebra search on index 'hi' (Host-Item-Number).
If you do not use this field at all (related to 773$9 in MARC21), Zebra
returns an Unsupported Use attribute error (114).
In making this change, I added one minor change:
[1] Remove the commented GetAnalyticsCount in additem.pl and correcting
indentation in that loop (removing tabs). So no change at all there.
NOTE: I will propose to bind the GetHostItemsInfo call in detail.pl and two
other scripts to this preference too on report 20702.
Test plan:
[1] If you use EasyAnalytics, verify that there is no change.
[2] If you do not, check the zebra-output.log. You should no longer see
searches for Host-Item-Number with 1=8911. (As well as ERROR 114 on
this index.)
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Charles Farmer <charles.farmer at inLibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f363de477899a95cb1d7f415013ce2bca8cfb93f
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jun 18 18:29:57 2018 +0000
Bug 17869: Don't show pick-up library for list of holds in OPAC account when there is only one branch
This patch modifies the user summary page in the OPAC so that the
"pick up location" column isn't shown in the table of holds if there is
only one library defined.
To test, apply the patch and log into the OPAC as a user with one or
more holds.
- In a system with more than one library defined the "Holds" tab of
opac-user.pl should show a "Pick up location" column.
- In a system with only one library defined there should be now "Pick
up location" column.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b4468f0987475c624142d96bbffd00b489ccfab0
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Jun 7 14:03:11 2018 +0000
Bug 20893: batchRebuildItemsTables.pl has incorrect parameter
To test:
1 - run batchRebuildItemsTables.pl with a valid biblionumber
perl /usr/share/koha/bin/batchRebuildItemsTables.pl --where biblio.biblionumber=38483 -c
2 - Note it says 'undefined biblionumber
3 - Apply patch
4 - Do it again
5 - It works!
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1a01c62f9dfca77df084501baa546afaa39dbe0f
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Mon Jun 25 14:58:17 2018 +0200
Bug 16653: (QA follow-up) Avoid a warning and remove unused variables
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d1587c494ade1718059337f96ec12ae10bd63cf6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jun 7 11:47:46 2018 -0300
Bug 16653: Display number of checkouts when exporting 'Most-circulated items' as CSV
reports/cat_issues_top.pl does not export "Count of checkouts" column as CSV
To replicate:
1/ Make sure that test instance has circulation in a given date range
2/ Go to Home › Reports › Most-circulated items
3/ Select a date range
4/ Select 'To screen into the browser' radio button, click submit.
5/ Note that Columns 'Rank/Biblioitemnumbers', 'Global' and 'Count of checkouts' appear in screen output.
6/ Click the browser's back button
7/ Change output to 'To a file', click submit.
Without this patch:
the columns "100/", "Global" and "Total" are exported to the CSV file.
"100/" contains the rank, "Global" is still global, and the "Total" column is empty.
With this patch patch applied, the last column is filled and the "Total" line is removed
(This script is really dirty)
Signed-off-by: Pierre-Luc Lapointe <pierreluc.lapointe at inLibro.com>
(Yes it is)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a09643ca23348009e409ae42057792224e7cbd0c
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Jun 8 09:43:13 2018 +0000
Bug 20903: Remove unnecessary category code parameters
Test plan:
0) Do no apply the patch
1) Have only one adults patrons category defined
2) Add a fine to child patron and pay it
3) Try to print the payment receipt (file printfeercpt.pl)
4) You see only ISE
5) Apply the patch
6) Try the printing again
7) Now you should see right receipt
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 46d288a61caea1541e0074051f5cff9e8d6b4f6e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jun 26 12:37:19 2018 -0300
Bug 20998: Simplify the conditional statement
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit fe9f7cef3be1768ec54acd7934b146d5d9d68927
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Jun 26 15:02:02 2018 +0000
Bug 20998: Only perform quicksearch if patron found with cardnumber
This patch makes sure we have a patron before we try to access their
branchcode and allows search to work
To recreate:
1 - Enable 'IndependentBranches'
2 - Setup a patron with all permissions, but not a superlibrarian
3 - Login to staff client as that patron
4 - Click 'Patrons' in the toolbar and try a search
5 - Internal server error
6 - Apply patch
7 - Try the search again
8 - Success!
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
catalogue/detail.pl | 2 +-
cataloguing/additem.pl | 26 +-
.../prog/en/includes/reports-toolbar.inc | 4 +-
.../prog/en/modules/catalogue/detail.tt | 20 +-
.../prog/en/modules/members/memberentrygen.tt | 20 +-
.../prog/en/modules/members/moremember.tt | 1244 ++++++++++++--------
.../en/modules/virtualshelves/addbybiblionumber.tt | 86 +-
.../opac-tmpl/bootstrap/en/includes/masthead.inc | 3 +-
.../bootstrap/en/modules/opac-addbybiblionumber.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 1 +
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 24 +-
koha-tmpl/opac-tmpl/bootstrap/js/authtoresults.js | 10 +
members/member.pl | 9 +-
members/memberentry.pl | 2 +-
members/printfeercpt.pl | 6 -
misc/batchRebuildItemsTables.pl | 2 +-
opac/opac-user.pl | 12 +
reports/cat_issues_top.pl | 17 +-
t/db_dependent/selenium/regressions.t | 61 +
t/lib/Selenium.pm | 9 +-
20 files changed, 928 insertions(+), 632 deletions(-)
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/js/authtoresults.js
create mode 100644 t/db_dependent/selenium/regressions.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list