[koha-commits] main Koha release repository branch master updated. v18.05.00-406-g70bfac5
Git repo owner
gitmaster at git.koha-community.org
Wed Aug 8 23:43:11 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 70bfac5ce5ee8e806015861d6cb473dfe1ee80b6 (commit)
via c0eb67a5572294c33e3f82c928e1cad709cb1c3a (commit)
via 6e5865ee4feaca3ca5575ce45d11fc88d88dc43d (commit)
via c0f7aed84d663029b2f1b37ce0391b5a40b10b97 (commit)
via 68e735b10151d7b70187fa7f9d4ecb2b94b34e6a (commit)
via b1e8193a84a8df6d70ad8de16dadb8c4301a706b (commit)
via b25c063f950076234cf7bb4a496921983a7cc23f (commit)
via 4b9021895a46bda5234cd6c852f339ba7cd4d882 (commit)
via 039d10044ce16f5a45ab35b79ea69d0526a1a519 (commit)
via 838c8ea5ff3c6ae399c4e23018aaf83fb10f96ab (commit)
via 15088c67d6c1960e98c216321985d667ccf26706 (commit)
via 7baa452a6a1609fae801802889dffe9ece32c20d (commit)
via 76603cc6b077cc9bc45bdc3688a94d290680777b (commit)
via 1d888c8d0e9ee2eda9c793cf75fd73a7afeaef16 (commit)
via d14ed73744fa23d4ed649da6d847f4b37cdfce92 (commit)
via 038e4011d4e4c1270592d476479062467a7a9be8 (commit)
via 003a4439802bc4053ed9e5db7719434256788b29 (commit)
via d463a1b3473106a0b501d6247afdc0f7f84a4ff4 (commit)
from c6b50f0bac092779f93033c8a3f002cb8722d7d4 (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 70bfac5ce5ee8e806015861d6cb473dfe1ee80b6
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Aug 8 21:24:56 2018 +0000
Bug 7143: Update timeline (2 new devs)
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c0eb67a5572294c33e3f82c928e1cad709cb1c3a
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Thu Aug 2 06:45:26 2018 +0000
Bug 21145: Do not show buttons for datatables on opac detail page
Test plan:
0) Do not apply the patch
1) Go to opac detail page
2) There are up to three datatables
- items
- items from other branches (only if there are any and the OpacSeparateHoldings preference is set)
- subscriptions
3) try to find record with all three tables and confirm, there is button
"Columns visibility" above the table
4) Apply the patch
5) Repeat 1-3 and confirm the button is no more here
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6e5865ee4feaca3ca5575ce45d11fc88d88dc43d
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 13 15:13:31 2018 +0000
Bug 21075: Unit tests
prove -v t/db_dependent/Reserves/AutoUnsuspendReserves.t
Signed-off-by: Pierre-Luc Lapointe <pierreluc.lapointe at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c0f7aed84d663029b2f1b37ce0391b5a40b10b97
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 13 14:45:55 2018 +0000
Bug 21075: AutoUnsuspendHolds should unsuspend holds <= today
To recreate:
1 - Place a hold in your system
2 - Set that hold (or all holds) to expire today
update reserves set suspend_until=CONCAT( CURDATE()," 00:00:00");
3 - Run misc/cronjobs/holds/auto_unsuspend_holds.p
4 - Note the hold is sitll suspended
5 - Visit /cgi-bin/koha/reserve/request.pl for the book with the hold
6 - Note the suspend date is tomorrow (and cannot be set to today]
7 - Click update holds - the date in db is now set to tomorrow
8 - Reset to today
9 - Apply patch
10 - Run the cron again
11 - Visit the page and note hold is unsuspended
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 68e735b10151d7b70187fa7f9d4ecb2b94b34e6a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jul 20 12:59:16 2018 -0300
Bug 21099: Reposition floating toolbars earlier
To recreate:
- Go to the advanced search form
- scrolldown to position the toolbar on top of the window
- scrollup
https://screenshots.firefox.com/NnkFg3iOXqLPxfkd/pro.kohadev.org
The toolbar should have been repositioned earlier
Test plan:
Edit a patron
- scrolldown
- scrollup
- unfold the form in the header (tab "Search patrons", link "[+]")
- scrolldown
- scrollup
Advanced search
scrolldown
scrollup
You should notice the difference with and without this patch
Signed-off-by: Pierre-Luc Lapointe <pierreluc.lapointe at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b1e8193a84a8df6d70ad8de16dadb8c4301a706b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jul 27 09:42:06 2018 +0200
Bug 21048: (QA follow-up) Fix authorized value statuses in filter
If you select an authorized value status in the filter, you want to keep
it too just like normal statuses as CHECKED.
The variable selected_status was not filled. The minimal fix is adding that
template variable in the script. Note that suggestion.STATUS is out of scope
within a loop using suggestion as loop var.
Note: Adding a regular status like CHECKED as an authorized value with
same code but another description works, but is kind of confusing ;) Not
in the scope of this report though.
Test plan:
Select an authval status in the filter. Apply the filter and verify again
that it is still selected under Suggestion information.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b25c063f950076234cf7bb4a496921983a7cc23f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jul 11 18:23:49 2018 -0300
Bug 21048: Fix display of suggestion's status (SUGGEST_STATUS)
When a suggestion's status is set to a customized value (AV
SUGGEST_STATUS), the description is not always displayed correctly.
Test plan:
- Create different values for the AV SUGGEST_STATUS
- Create several suggestions
- Change the status using the SUGGEST_STATUS values
- Edit the suggestion and change again the status
- View the suggestions for a given patron
(members/purchase-suggestions.pl?borrowernumber=XX), the statuses must
displayed correctly
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4b9021895a46bda5234cd6c852f339ba7cd4d882
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jul 16 17:24:04 2018 +0000
Bug 21041: "Merge patrons" button remains disabled with "Select all" option
This patch modifies the JavaScript functions for the select all/clear
all links so that each action triggers the "change" event, required to
enable or disabled the "merge selected patrons" button.
To test, apply the patch and perform a patron search which will return
multiple results.
- Test the "select all" and "clear all" links, and confirm that the
"Merge selected patrons" button is enabled and disabled.
- Test that checking and unchecking multiple checkboxes still works
correctly to enable and disable the button.
Signed-off-by: Pierre-Luc Lapointe <pierreluc.lapointe at inLibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 039d10044ce16f5a45ab35b79ea69d0526a1a519
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Wed Aug 1 15:51:22 2018 +0000
Bug 21151: Fix SRU search fields mapping pop-up
The SRU search fields mapping pop-up comes up as a blank white
page.
To test:
- Go to Administration > Z39.50/SRU servers
- Modify or create an SRU server
- Click on the 'Modify' button to change mappings
- Verify the new window that opens is blank
- Apply patch
- Verify the pop-up now is no longer blank but works
correctly.
Bonus: Spottd some HTML errors while looking for the
problem. Also fixed in the patch.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 838c8ea5ff3c6ae399c4e23018aaf83fb10f96ab
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Mar 16 11:36:46 2018 +0100
Bug 19436: (QA follow-up) see 19608 Fix use of intranet-bottom in template
Bug 19608 incorrectly replaced intranet-bottom by popup-bottom.
Adjusting the new template in the same way.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 15088c67d6c1960e98c216321985d667ccf26706
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Mar 16 09:52:19 2018 +0100
Bug 19436: (QA follow-up) Revert change in _handle_one_result
See Bugzilla comment 7. This change does not belong here and is
dubious on its own. Needs further attention on another report.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Amended: In consultation with the author the same change is applied to the
corresponding lines in Z3950SearchAuth.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7baa452a6a1609fae801802889dffe9ece32c20d
Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
Date: Wed Feb 7 16:02:35 2018 +0100
Bug 19436: Add SRU support for authorities
Test plan:
- Apply the patch
- Add an SRU authority server in admininistration -> Z39.50/SRU servers
You can try with the French national library, configured as such:
Hostname: catalogue.bnf.fr
Port: 80
Database: api/SRU
Syntax: Unimarc
Record type: authority
Additional SRU options: version=1.2,sru=get
SRU Search fields mapping example:
Keyword (any): aut.anywhere
Name (any): aut.anywhere
Author (any): (aut.type any "pep org") and aut.accesspoint
Author (personal): aut.type=pep and aut.accesspoint
Author (corporate): aut.type=org and aut.accesspoint
Author (meeting/conference): aut.type=org and aut.accesspoint
Subject heading: (aut.type any "geo ram_nc ram_ge ram_pe ram_co") and aut.accesspoint
Subject sub-division: aut.type=ram_pe and aut.accesspoint
Title (any): (aut.type any "tic tut tum ram_tp ram_tu") and aut.accesspoint
Title (uniform):(aut.type any "tut tum ram_tu") and aut.accesspoint
- Try a search from Authorities -> New from Z39.50/SRU
- Check that the authority is correctly displayed in "Show Marc"
- Check that the authority is correclty added to koha in "Import"
- prove t/db_dependent/Breeding.t
Signed-off-by: François Pichenot <fpichenot at ville-roubaix.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 76603cc6b077cc9bc45bdc3688a94d290680777b
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Aug 6 14:34:12 2018 +0000
Bug 21163: Basket group detail page layout is broken
This fixes a problem with layout of the page when viewing a closed
basket group. Changed the grid options for basket information when a
basket group is closed.
To test, apply the patch and go to Acquisitions -> Vendor -> Basket
groups. You should have multiple baskets and basket groups to test with.
- Edit an open basket group. The layout should look correct, with basket
group information in the form in the left column and ungrouped basket
in the right column. Grouping and ungrouping baskets should work
correctly.
- View a closed basket group. The basket group information should
display in a single column that spans the main part of the page.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1d888c8d0e9ee2eda9c793cf75fd73a7afeaef16
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jul 11 11:29:15 2018 -0300
Bug 21018: Allow uris defined in the item
We need to search for uri defined for the itemnumber we passed in
parameter.
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 d14ed73744fa23d4ed649da6d847f4b37cdfce92
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jun 29 10:29:30 2018 -0300
Bug 21018: Fix TrackClicks for 952$u
Caused by
commit 51b6cf2aafbfb45b9fcb072403b986fe3c2add53
Bug 19847: Track links within the records and 404 for others
We should also accept uri stored in items.uri (952$u)
Test plan:
- Turn on TrackClicks
- Defined uri for some items
- At the OPAC click on the link (from opac-detail.pl)
=> Without this patch you will get 404 (redirected from tracklinks.pl)
=> With this patch applied you will be redirected correctly and the
linktracker will be filled correctly
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
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 038e4011d4e4c1270592d476479062467a7a9be8
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Thu Aug 2 15:56:11 2018 +0200
Bug 14662: Add empty entries to pull downs in cataloguing form for mandatory subfields
First patch deals with the problem on the item form, this
patch fixes the same problem on catalouging form for the
bibliographic record.
To test:
- Adapt your frameworks:
- Make sure 942$c is mandatory
- Link another field to an authorised value, for example: 942$n to YESNO
- Add a new record
- Verify that the first value of each pull down is preselected,
there is no way to trigger the 'required' error
- Apply patch
- Add a record
- Verify that classification source is preselected according to the
DefaultClassificationSource system preference
- Verify that 942$c now defaults to empty
- Verify all your other mandatory subfields can be set to empty
- Verify that you can't save before correctly setting them
- Chane your frameworks
- Add a default value for 942$c, for example: CF
- Add another record
- Verify the itemtype is now preset to your default itemtype
- Edit an existing record, verify all values show correctly
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 003a4439802bc4053ed9e5db7719434256788b29
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Tue Jul 31 23:58:33 2018 +0000
Bug 14662: Add empty entries to pull downs on item form for mandatory subfields
The code assumed that if a subfield is marked as mandatory, there should be no
empty entry in the pull downs.
This assumption is not correct, as it leads to the first entry of the
pull down being preselected if there is no default set. Which means you
will never be alerted of any cataloguing errors and errors will be very
hard to find later on.
Correct behaviour would be to preselect the empty value when there is
no default. This means on saving the item an error message is triggered
and the cataloger is forced to set the value.
To test:
- Adapt your frameworks:
- Make 942$c non-mandatory
- In 952 make itemtype, classification source and some other pull downs
like location or collection mandatory
- Add a new item
- Verify that the first value of each pull down is preselected,
there is no way to trigger the 'required' error
- Apply patch
- Add a new item
- Verify that classification source is preselected according to the
DefaultClassificationSource system preference
- Verify that the itemtype is preselected according to 942$c in
the bibliographic record
- Verify all mandatory fields can be set to empty
- Verify that you can't save before correctly setting them
- Change the 942$c in the record to empty
- Add another item
- Verify the itemtype is now empty
- Change your frameworks and set a default for itemtype (Ex: BK)
- Repeat default check with another pull down like collection or location
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
We do not want empty values for branches (holdingbranch and homebranch
must be mandatory, see bug 21011)
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d463a1b3473106a0b501d6247afdc0f7f84a4ff4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Aug 2 11:47:24 2018 -0300
Bug 21149: Fix superlibrarian creation in onboarding
See bug 21087 for more details.
Test plan:
Drop your DB
Start the installation process
Use the onboarding process to install missing data
The superlibrarian created during this process should be created
sucessfully and allowed to login
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Breeding.pm | 172 ++++++++------------
C4/Reserves.pm | 2 +-
admin/sru_modmapping.pl | 5 +-
cataloguing/addbiblio.pl | 11 +-
cataloguing/additem.pl | 6 +-
cataloguing/z3950_auth_search.pl | 2 +-
docs/history.txt | 2 +
installer/onboarding.pl | 8 +-
.../lib/jquery/plugins/jquery.fixFloat.js | 14 +-
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 1 +
.../prog/en/includes/authorities-toolbar.inc | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 +
.../prog/en/modules/acqui/basketgroup.tt | 6 +-
.../prog/en/modules/admin/sru_modmapping.tt | 8 +-
.../prog/en/modules/admin/sru_modmapping_auth.tt | 98 +++++++++++
.../prog/en/modules/admin/z3950servers.tt | 14 +-
.../prog/en/modules/members/member.tt | 4 +-
.../en/modules/members/purchase-suggestions.tt | 23 ++-
.../prog/en/modules/suggestion/suggestion.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 6 +-
opac/tracklinks.pl | 5 +-
suggestion/suggestion.pl | 7 +-
t/db_dependent/Breeding.t | 16 +-
t/db_dependent/Reserves/AutoUnsuspendReserves.t | 57 +++++++
24 files changed, 319 insertions(+), 154 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt
create mode 100644 t/db_dependent/Reserves/AutoUnsuspendReserves.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list