[koha-commits] main Koha release repository branch master updated. v17.11.00-718-gb86a9ee
Git repo owner
gitmaster at git.koha-community.org
Sun Feb 18 20:57:21 CET 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 b86a9ee984ece06e11e0f490027771125d5fc9a7 (commit)
via 3eb50270b1a02fe98cde767ad0240b2943e23321 (commit)
via a418f73cf57c9b9ecc54feb2a9b42e67084150b2 (commit)
via 466c46f4f64b83abc8205e4ff0600587fa69d234 (commit)
via 22ab693c76346b3b2c28463f35df69ae808d98e5 (commit)
via d63cd0efbb9c59bab5de2aa67b3fb4831221a105 (commit)
via e5e150440b2333793cf4b1c8d773285439f69151 (commit)
via ac6869eed1304cf748f34265541fbfa15153c621 (commit)
via 00bfa63dc7cb8322045690745e818dbd05dcbe64 (commit)
via 5977dedb945b274e86d225cb7e14549965cc9305 (commit)
via 30f6f17664a41b4a536b13fe6bc71cfc3e89afc5 (commit)
via 5d8155439eb91471400ad04a1f95da4e77d80dad (commit)
via 90e0c0de5c127664177821ac9d05aca046e0d823 (commit)
via 53e8b8cbe0ff98fb691cb80f7b9986b49b94be5c (commit)
via 138afb693ebfa09208bffb5ab0e18aa2bb96da38 (commit)
via 58b5c925cc14dcb85455f071efdf94acc5b1787f (commit)
via 744e9a03791f50be98cb5c43cb4223f31fa30ed4 (commit)
via 69e51d729ff7e5e1a90a0d6ce13e2ca6a0c69308 (commit)
via 208f1021255f388418135ea0aac4e4e4258d0525 (commit)
from 549b8fe787ffd9edd38c71c0c5b362f5df9062b0 (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 b86a9ee984ece06e11e0f490027771125d5fc9a7
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jan 18 18:29:10 2018 +0000
Bug 20037: Switch single-column templates to Bootstrap grid: Serials
This patch updates several single-column Serials module templates to
use the Bootstrap grid. In addition to grid changes, some templates have
been modified to include the footer with the correct popup parameter.
- serials\acqui-search.tt - Go to Serials -> New subscription. Click
"Search for a vendor."
- serials\acqui-search-result.tt - Vendor search results
- serials\result.tt - Click "Search for record."
- serials\subscription-bib-search.tt - Catalog search results.
Each of these pages should look correct.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3eb50270b1a02fe98cde767ad0240b2943e23321
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Jan 16 15:03:29 2018 +0000
Bug 19981: Switch single-column templates to Bootstrap grid: Course reserves
This patch updates three single-column course reserves templates to use
the Bootstrap grid:
- course-reserves.tt - The main Course Reserves page
- course-details.tt - The detail view of an individual course
- course.tt - Editing a course
- add_items-step1.tt - Adding items to a course, step 1 (scan barcode)
- add_items-step2.tt - Adding items to a course, step 2
- invalid-course.tt - The error page shown if you try to view
course_reserves/course-details.pl directly without passing a course id
in the URL
- Also changed in this template: Error message has been wrapped in the
standard "dialog alert" <div>.
Each of these pages should look correct, with a single centered column
with wide margins on either side. At lower browser widths the margins
should disappear.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a418f73cf57c9b9ecc54feb2a9b42e67084150b2
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jan 11 18:16:39 2018 +0000
Bug 19954: Update popup window templates to use Bootstrap grid: Patrons
This patch updates two patron-related templates to use the
Bootstrap grid instead of the YUI grid.
This patch also corrects an unrelated error in update-child.tt where
some JS variable declarations required by members-menu.js were
missing.
To test you must have more than one adult-type patron category defined.
- Locate and view a child-type patron record.
- From the "More" menu in the toolbar, choose "Update child to adult
patron."
- The popup window which appears should look correct and work
correctly.
- The table of patron categories should be sortable.
- Add a new patron and enter the first and last names of an existing
patron.
- When Koha asks to confirm a possible duplicate record, click the
"View existing record" link. The popup which is triggered should
look correct.
Signed-off-by: Zoe Bennett <zoebennett1308 at gmail.com>
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 466c46f4f64b83abc8205e4ff0600587fa69d234
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Jan 9 19:11:12 2018 +0000
Bug 19939: Move cataloging Z39.50 results actions into menu
This patch modifies the template which displays cataloging Z39.50
search results so that the "MARC," "Card," and "Import" links are moved
out of separate table cells and into one menu.
The old menu which would appear when any table cell is clicked has been
removed, and code added to display the same Bootstrap menu if a table
cell is clicked.
To test, apply the patch and go to Cataloging -> New from Z39.50/SRU.
- Perform a Z39.50 search which will return more than one result.
- Confirm that clicking the "Actions" button triggers a drop-down menu.
- Confirm that the links in the menu trigger actions for the correct
bibliographic record.
- Confirm that clicking any other table cell in the table of results
will trigger the display of the same menu.
- Confirm that this menu works correctly for the correct record.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 22ab693c76346b3b2c28463f35df69ae808d98e5
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jan 3 01:40:13 2018 +0000
Bug 19837: Add error feedback for duplicated or unfound cardnumbers
To test:
1 - Enter some patrons on a list
2 - 'Enter multiple cardnumbers'
3 - Make sure to add some that are already in list, some that don't
exist, and some new patrons
4 - Verify results are as expected with warnings
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d63cd0efbb9c59bab5de2aa67b3fb4831221a105
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Dec 15 17:26:12 2017 +0000
Bug 19837: Add multiple patrons to a list by barcode
This patch adds the interface change and basic functionality for an
option to add multiple patrons to a patron list by scanning barcodes.
To test, apply the patch and go to Tools -> Patron lists.
- Create a patron list if necessary, and got to the "Add patrons"
screen.
- Test the process for adding patrons using the "Patron search" text
input.
- Test the process for adding patrons using the "Enter multiple card
numbers" option.
This should really have some error-handling added to it: Onscreen
messages when a non-existing patron card number is submitted or when a
patron already exists on the list.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e5e150440b2333793cf4b1c8d773285439f69151
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Feb 18 16:39:01 2018 -0300
Bug 19785: Replace intranet-tmpl with [% interface %]
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ac6869eed1304cf748f34265541fbfa15153c621
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Dec 8 19:09:05 2017 +0000
Bug 19785: Move template JavaScript to the footer: Authorities, part 1
This patch modifies even more staff client authorities templates so
that JavaScript is included in the footer instead of the header.
To test, apply the patch and test the JavaScript-driven features of the
modified templates: All button controls, DataTables functionality, tabs,
etc.
- Authorities
- New from Z39.50
-> Search
-> Results
- New from Z39.50
- Deletion confirmation
- Merge records -> Merge
- Tabs
- Tag selection
-> Authority detail
- Tabs
- Deletion confirmation
- New from Z39.50
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 00bfa63dc7cb8322045690745e818dbd05dcbe64
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Feb 18 16:47:12 2018 -0300
Bug 17672: DBRev 17.12.00.017
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5977dedb945b274e86d225cb7e14549965cc9305
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Feb 18 16:44:51 2018 -0300
Bug 17672: DBIC Schema changes
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 30f6f17664a41b4a536b13fe6bc71cfc3e89afc5
Author: charles <charles at inlibro.com>
Date: Fri Nov 3 16:21:04 2017 -0400
Bug 17672: Fixing Items.t expected tests from 12 to 13
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5d8155439eb91471400ad04a1f95da4e77d80dad
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jul 19 13:10:41 2017 +0000
Bug 17672: Add damaged_on to items and deleteditems tables
This patchset adds a 'damaged_on' column to store the date an item is
marked damaged, analogous to withdrawn_on and itemlost_on
To test:
1 - Apply patch
2 - Mark an item damaged via moredetail.pl (Items tab on left in
details)
3 - Note the damaged on date apears below
4 - Unmark the item, the date is removed
5 - Go to the edit items screen (from top bar 'Edit->edit items')
6 - Mark item damaged - check db or moredetails.pl to see damaged_on
date
7 - Unmark item damaged - confirm date is removed
8 - prove t/db_dependent/Items.t
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Charles Farmer <charles.farmer at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 90e0c0de5c127664177821ac9d05aca046e0d823
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Feb 18 15:10:30 2018 -0300
Bug 20148: Prevent adding same user multiple times to an order
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 53e8b8cbe0ff98fb691cb80f7b9986b49b94be5c
Author: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Date: Wed Feb 7 09:45:20 2018 +0200
Bug 20148: Prevent adding same user multiple times to acq basket
When adding a user to manage acquisitions basket, it is possible
to add the same user multiple times. Prevent that.
Test plan:
1) Go to Home -> Acquisitions -> [bookseller] -> [basket]
2) On the "Add user" in the Managed by-part, and try adding
the same user multiple times.
3) Apply patch
4) Repeat 1 and 2. You should now get an error message saying
the user is already in the list.
Signed-off-by: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Signed-off-by: Roch D'Amour <roch.damour at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 138afb693ebfa09208bffb5ab0e18aa2bb96da38
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Feb 16 14:33:12 2018 +0000
Bug 20222: Make bread crumb for cleanborrowers.pl match the link text in tools-home.pl
This patch revises the breadcrumbs in the template for batch patron
deletion / anonymization so that they match the text used in the tools
menu and on Tools home.
To test, apply the patch and go through a batch patron anonymization
process. At each step the breadcrumbs should read "Batch patron
deletion/anonymization" instead of "clean patron records."
Signed-off-by: Roch D'Amour <roch.damour at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 58b5c925cc14dcb85455f071efdf94acc5b1787f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Oct 12 13:13:41 2017 +0200
Bug 19452: Remove the truncate option
The truncate option is not really useful. Its result is probably not what
most users of this script expect or need.
It truncates both tables borrower_message_preferences and
borrower_message_transport_preferences. This (unfortunately) includes
deleting messaging preferences for patron categories. After that, adding
preferences again will not add categories again, but only borrower
preferences which are all disabled.
Furthermore, we do not need to disable the foreign key check. Neither
do we actually need to truncate, deleting records seems sufficient.
Also deleting transport preferences is not needed, since it will be
done by a cascade from messaging preferences. Note that the subsequent
call of SetMessagingPreferencesFromDefaults will already delete the
records.
This makes it possible to remove the truncate option altogether.
Test plan:
[1] Select a patron category (say ST) and change days_in_advance to x.
[2] Select a ST patron and set days_advance to y in his msg prefs.
[3] Run borrowers-force-messaging-defaults.pl -doit
[4] Verify that the patron has been reset to the default prefs (incl.
value x in days_in_advance).
[5] Verify that the patron category prefs are still intact.
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: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 744e9a03791f50be98cb5c43cb4223f31fa30ed4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 14 15:15:39 2018 -0300
Bug 20145: Do not insert 0000-00-00 in patron tests (and more)
We should call Koha::Patron->is_expired in CanBookBeIssued instead of
doing the same calculation.
Tests have been adapted to pass with new SQL modes.
We should not need to update the values in DB, we already have
Bug 14717: Prevent 0000-00-00 dates in patron data (3.21.00.023)
Test plan:
prove t/db_dependent/Circulation/dateexpiry.t
prove t/db_dependent/Koha/Patrons.t
must return green
Signed-off-by: Roch D'Amour <roch.damour at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 69e51d729ff7e5e1a90a0d6ce13e2ca6a0c69308
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 16 10:25:00 2018 -0300
Bug 19978: Fix ITEMTYPECAT behaviour
ITEMTYPECAT permits to group and hide item types at the OPAC (see bug
10937 for a complete description).
Since commit 091d6c513bcbee224ff06477e79be48cea7fe825
Bug 17843: Replace C4::Koha::getitemtypeinfo with Koha::ItemTypes
the code assume that they are item types. Before it just assigned undef
to the description.
Test plan:
Create ITEMTYPECAT authorised values
Assign an item type to this authorised value group
Search for a item using this item type at the OPAC
Without this patch applied you get:
Can't call method "translated_description" on an undefined value at
/home/vagrant/kohaclone/opac/opac-search.pl line 231.
With this patch applied the search result is displayed.
Make sure the original feature still works.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 208f1021255f388418135ea0aac4e4e4258d0525
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Dec 21 17:15:43 2017 -0300
Bug 18975: Retrieve up-to-date CGISESSID when just logged in
If a user is asked to login before sending a card, the wrong (old)
CGISESSID cookie is used.
We need to retrieve the one that has just been created.
This will certainly need more work, I guess other scripts are affected
too.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 11 +--
C4/Items.pm | 4 +-
C4/Utils/DataTables/Members.pm | 3 +-
Koha.pm | 2 +-
Koha/Patron.pm | 4 +-
Koha/Schema/Result/Deleteditem.pm | 16 +++-
Koha/Schema/Result/Item.pm | 16 +++-
admin/columns_settings.yml | 3 +-
installer/data/mysql/kohastructure.sql | 2 +
installer/data/mysql/updatedatabase.pl | 17 +++-
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 4 +
koha-tmpl/intranet-tmpl/prog/en/columns.def | 1 +
.../prog/en/includes/authorities-search.inc | 16 ----
.../prog/en/includes/authorities-toolbar.inc | 24 -----
.../prog/en/includes/authorities_js.inc | 54 ++++++++++-
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +-
.../prog/en/modules/acqui/neworderempty.tt | 2 +-
.../en/modules/authorities/authorities-home.tt | 28 ++----
.../prog/en/modules/authorities/detail.tt | 75 ++++++---------
.../prog/en/modules/authorities/merge.tt | 75 ++++++++-------
.../en/modules/authorities/searchresultlist.tt | 45 ++-------
.../prog/en/modules/catalogue/moredetail.tt | 3 +
.../prog/en/modules/cataloguing/z3950_search.tt | 79 ++++++++++------
.../en/modules/course_reserves/add_items-step1.tt | 6 +-
.../en/modules/course_reserves/add_items-step2.tt | 6 +-
.../en/modules/course_reserves/course-details.tt | 7 +-
.../en/modules/course_reserves/course-reserves.tt | 13 +--
.../prog/en/modules/course_reserves/course.tt | 7 +-
.../en/modules/course_reserves/invalid-course.tt | 16 ++--
.../prog/en/modules/members/moremember-brief.tt | 47 ++++++----
.../prog/en/modules/members/update-child.tt | 22 +++--
.../prog/en/modules/patron_lists/list.tt | 96 +++++++++++++++++---
.../prog/en/modules/serials/acqui-search-result.tt | 8 +-
.../prog/en/modules/serials/acqui-search.tt | 8 +-
.../prog/en/modules/serials/result.tt | 8 +-
.../en/modules/serials/subscription-bib-search.tt | 7 +-
.../prog/en/modules/tools/cleanborrowers.tt | 12 ++-
.../borrowers-force-messaging-defaults.pl | 20 +---
opac/opac-search.pl | 5 +-
opac/opac-sendbasket.pl | 3 +-
patron_lists/list.pl | 22 +++++
t/db_dependent/Circulation/dateexpiry.t | 4 +-
t/db_dependent/Items.t | 39 +++++++-
t/db_dependent/Koha/Patrons.t | 8 +-
44 files changed, 496 insertions(+), 354 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list