[koha-commits] main Koha release repository branch master updated. v17.05.00-913-g3bf15a5
Git repo owner
gitmaster at git.koha-community.org
Wed Oct 25 17:20:14 CEST 2017
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 3bf15a5f04acbf6cdda8ef645c9b5523197c9096 (commit)
via 8bb8decf0122d67d20bd870d313b42bea63564fa (commit)
via c2b9b3f8312f4d33f0e9cecfccb125af7a05415c (commit)
via afcaccdad2fbbc98a332b065d186beaeb59b009f (commit)
via 662a98345a71fb170bc6ae5b3679e3edf4eee96f (commit)
via 2ecb68346c21bf5fbfb45e502b091aa13e78718a (commit)
via 7827a941d45997db9d54c4f402257befc1c14082 (commit)
via c089fa0373dc353fcb4ecaf7c8c360769ece9a74 (commit)
via 92f6f5b049cc6a45917465f87efa93d51ff81a4a (commit)
via 5ea5fc83d9ac700c580aed411db7a3c988cb6f8e (commit)
via 0a9c905ff097003be6c7e6e87ae4b38866fe4a28 (commit)
via 02a42f92eddef8dae5e155cf5137782c2907b63c (commit)
via d4bf488a2a13b77b76d216acf75234b36e5855f4 (commit)
via 1d3353934347b81dded262e1d2d213e9f4302be8 (commit)
via ab5c810dacd224444b4ee6f492715aa6027d33ab (commit)
via 8de824115e553f1a1b02333223972f79bc717b62 (commit)
via db14275db430fb76afbab8a18464f54591b30f53 (commit)
via 1a8ca21875f86f25c72baf38e29d27af05c988b0 (commit)
via d6a1f2ab242474c9e477c2f6d4df5c316a4ef448 (commit)
from 42c634745cac4fc33a53bc1312a3e143a2e0ffbc (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 3bf15a5f04acbf6cdda8ef645c9b5523197c9096
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 25 12:07:44 2017 -0300
Bug 17381: DBRev 17.06.00.021
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8bb8decf0122d67d20bd870d313b42bea63564fa
Author: Marc Véron <veron at veron.ch>
Date: Mon Aug 21 15:27:20 2017 +0200
Bug 17381: Add system preference SCOMainUserBlock
This patch adds a system preference SCOMainUserBlock to display custom HTML
on the self checkout page.
To test:
- Set up self checkout (see section Self Checkout in Circulaton sysprefs )
- Apply patch
- Update db
- Add some HTML system preference SCOMainUserBlock
- Go to sco page
- Verify that HTML displays on page (logged in and not logged in)
New version based on Koha.Preference TT plugin as of comment #7
Depends on Bug 12691
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c2b9b3f8312f4d33f0e9cecfccb125af7a05415c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 24 14:57:54 2017 -0300
Bug 19028: DBRev 17.06.00.020
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit afcaccdad2fbbc98a332b065d186beaeb59b009f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 25 11:56:31 2017 -0300
Bug 19028: Add a note to the pref description
The idea was to keep the current behaviour, plus adding the option to
display on a separate column.
We need an explanation on the syspref description, stating that it is not enough to
choose 'on a separate column', enabling the colum in the columns
settings is required for it to take effect.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 662a98345a71fb170bc6ae5b3679e3edf4eee96f
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Aug 3 12:55:07 2017 -0300
Bug 19028: Add 'shelving location' to holdings table in detail page
This patch adds the option to show shelving locations on a separate
column. This is controlled by a new syspref, 'OpacLocationOnDetail',
which replaces 'OpacLocationBranchToDisplayShelving', adding a
conveniente 'column' option.
The new 'Shelving location' column is conveniently added to the columns
configuration entry added by bug 16759 for this purpose.
The current behaviour is preserved.
To test:
- Apply this patches
- Run the upgrade:
$ sudo koha-shell kohadev
k$ cd kohaclone
k$ perl installer/data/mysql/updatedatabase.pl
=> SUCCESS: Upgrade doesn't fail
- Have an item with shelving location set to something not void
- Have the item set home and holding libraries for testing purposes.
- Set 'OpacLocationBranchToDisplay' to 'home and holding libraries' [*]
- Visit the OPAC detail page for the record containing the item
=> SUCCESS: Both home and holding libraries are displayed.
- Loop through all OpacLocationOnDetail options (except from 'column', we leave it for later).
=> SUCCESS: Works as expected.
- Go to Administration > Columns settings
- Make item_shelving_location available in the OPAC section
- Reload the OPAC detail page
=> SUCCESS: No change
- Set OpacLocationOnDetail to 'on a separate column'
- Reload the OPAC detail page
=> SUCCESS: Shelving location is displayed on a separate column
- Sign off :-D
Sponsored-by: Dover
[*] For testing purposes
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2ecb68346c21bf5fbfb45e502b091aa13e78718a
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Aug 3 12:52:52 2017 -0300
Bug 19028: Add OpacLocationOnDetail syspref
This patch renames the 'OpacLocationBranchToDisplayShelving' syspref into
'OpacLocationOnDetail' and adds it a fourth option, 'column', that makes
the OPAC display shelving location on a separate column, instead of the
library names (home, holding or both).
Sponsored-by: Dover
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7827a941d45997db9d54c4f402257befc1c14082
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Oct 25 10:55:12 2017 +0000
Bug 16759: Use index of elements in specific table
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c089fa0373dc353fcb4ecaf7c8c360769ece9a74
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Oct 24 19:19:09 2017 -0300
Bug 16759: Handle the otherholdings tab gracefuly
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 92f6f5b049cc6a45917465f87efa93d51ff81a4a
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jul 28 16:28:08 2017 -0300
Bug 16759: Make OPAC holdings table configurable
This patch makes the holdings table in the OPAC biblio detail page
configurable using the Columns configuration tools.
This patch:
- Moves the holdingst table from plain DataTable to KohaTable
- Creates a sample yml colvis configuration for this table
containing all the currently available columns
To test:
- Visit some record's detail page in the OPAC
- Apply this patch
- Reload
=> SUCCESS: The page shows the same information
- On the staff interface, go to:
Home > Administration > Columns settings
=> SUCCESS: There's a new OPAC section containing the configuration for
holdingst.
- Choose to hide some fields (both currently displayed and currently hidden).
- Reload the OPAC detail page
=> SUCCESS:
- Required fields are hidden
- It doesn't explode because of trying to hide stuff that is not there to start with
- Sign off :-D
Sponsored-by: DOVER
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Followed test plan, patch worked as described. Also passed QA test tool
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5ea5fc83d9ac700c580aed411db7a3c988cb6f8e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jul 12 09:32:24 2017 -0300
Bug 17277: Always display location and *branch item info - opac detail
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0a9c905ff097003be6c7e6e87ae4b38866fe4a28
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 24 14:53:36 2017 -0300
Bug 19513: Re-add AnonymousPatron-related tests
These tests are still useful
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
The AddMember call is considerably slowing it down. A call to TestBuilder
would be an improvement for performance.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 02a42f92eddef8dae5e155cf5137782c2907b63c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Oct 20 09:03:35 2017 +0200
Bug 19513: More changes to MarkIssueReturned.t (after bug 19487)
This patch was initially created as QA follow-up on 19487.
$dbh is not used
$categorycode is no longer used
%item_branch_infos not used
$borrowernumber is obsoleted by using $patron
No real need for $anonymous_borrowernumber (Since MarkIssueReturned returns
undef rightaway for an invalid itemnumber, the privacy stuff is irrelevant.)
No AddMember calls, removing unneeded modules
Adding a test that calls MarkIssueReturned on an item already returned.
Test plan:
[1] Run t/db_dependent/Circulation/MarkIssueReturned.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d4bf488a2a13b77b76d216acf75234b36e5855f4
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Oct 24 12:12:52 2017 +0000
Bug 18735: QA Followup - add class to new option
New option creates a single item batch, this may cause issues for some
libraries or they may want to disbale this feature. Adding a class to
the list item allows it to be hidden easily
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1d3353934347b81dded262e1d2d213e9f4302be8
Author: Nazlı <nazli at devinim.com.tr>
Date: Thu Jun 29 16:24:21 2017 +0300
Bug 18735: Print Barcode as soon as adding an item
For testing
1) Look for any records.
2) Go to the material edit page.
3) Under Actions you will see Print label under Duplicate.
4) When you click Print Label, the relevant material will be redirected
to the Label Creator module in the Tools menu.
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ab5c810dacd224444b4ee6f492715aa6027d33ab
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Mon Jul 17 22:22:55 2017 +0000
Bug 18949: Adding thead tags to OPAC MARC details holdings table
So that it can be styled alongside other tables in the OPAC.
To test:
1) Log into staff side
2) Find OPACUserCSS syspref and add the following CSS:
th,
.table-bordered>thead>tr:first-child>th {
color: red;
}
3) Log into the OPAC
4) Go to your fines, your search history, your reading history etc -
notice all of these table's headings are styled with red text
5) Go to the detail page of an item, then the MARC view.
Notice this table's headings are now styled with red text
6) Apply patch and refresh page
7) Your holdings table should now have red headings.
(You can delete the CSS from OPACUserCSS if you'd like.)
Sponsored-by: Catalyst IT
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8de824115e553f1a1b02333223972f79bc717b62
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Tue Apr 4 23:51:16 2017 +0000
Bug 18184: Show frequency and numbering pattern info when viewing all subs attached to a biblio
To test:
1) Go to Serials, find a serial with more than one subscription
2) Click Serial collection
3) Notice how Frequency and Numbering pattern are filled out correctly
4) Click 'see any sub attached to this biblio'
5) Notice how Frequency and Numbering pattern are now missing info
6) Apply patch and refresh page
7) Confirm Frequency and Numbering pattern now show as expected
Sponsored-by: Catalyst IT
Signed-off-by: sonia BOUIS <sonia.bouis at univ-lyon3.fr>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit db14275db430fb76afbab8a18464f54591b30f53
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 12 13:03:04 2017 -0300
Bug 19298: Placing a hold from a list at the OPAC should respect issuing rules
The issuing rule retrieve to know if a hold can be placed on a record of
a list is not correct.
Test plan:
0/ With item-level_itypes = item level
1/ Define a item.itype=BK and biblioitems.itemtype=CF
2/ Create a default rule to allow on shelf holds
3/ Create a specific rule for CF with on shelf holds="If any
unavailable"
4/ Add this bibliographic record to a list and view the list
=> Without this patch you will not see "Place hold"
=> With this patch applied you will see the "Place hold" button,
respecting the correct issuing rule
Followed test plan, patches worked as described.
Note: Just to clarify the test plan slightly in step 4 where it says you will not see 'Place Hold' it means to
the left of the 'Save to another List' link below the item availability
in the opac-shelves.pl page. Not the 'Place hold' button in the grey
page header box.
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1a8ca21875f86f25c72baf38e29d27af05c988b0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 9 19:17:45 2017 -0300
Bug 19431: Fix error when checking out an unknown barcode
It seems this has been caused by
commit 1544f9a5d4a8acd47c97d7c6ac55dee8e759d3ff
Bug 18276: Remove GetBiblioFromItemNumber - circulation pages
To reproduce the problem you need switch on the two prefs
- OnSiteCheckouts
- OnSiteCheckoutsForce
Test plan:
Try to check an item out using an unknown barcode
With the 2 prefs set to on and without this patch, you will get the
following error in the log
Can't call method "materials" on an undefined value at
/home/vagrant/kohaclone/circ/circulation.pl line 387.
With this patch applied you should not get this error and a correct
behaviour for the different pref combinations.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d6a1f2ab242474c9e477c2f6d4df5c316a4ef448
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Oct 20 10:49:38 2017 -0400
Bug 19495: Automatic report conversion needs to do global replace on 'biblioitems' and 'marcxml'
Bug 17898 provides a way of converting reports that use biblioitems.marcxml so that they will use biblio_metadata.metadata instead.
This only works with reports that do not refer to other columns in the biblioitems table. This is a known limitation. It means that we should be able to do a substitution of every occurrence of biblioitems with biblio_metadata, and every occurrence of marcxml with metadata.
Unfortunately, we're not doing a global replace, we're only replacing the first occurrence.
Test Plan:
1) Apply this patch
2) prove t/db_dependent/Reports/Guided.t
All tests successful.
Files=1, Tests=9, 10 wallclock secs ( 0.11 usr 0.01 sys + 2.85 cusr 0.25 csys = 3.22 CPU)
Result: PASS
Signed-off-by: Dominic Pichette <dominic at inlibro.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Reports/Guided.pm | 4 +-
Koha.pm | 2 +-
admin/columns_settings.yml | 37 ++++
circ/circulation.pl | 5 +-
installer/data/mysql/sysprefs.sql | 3 +-
installer/data/mysql/updatedatabase.pl | 25 +++
.../prog/en/modules/admin/columns_settings.tt | 6 +
.../en/modules/admin/preferences/circulation.pref | 5 +
.../prog/en/modules/admin/preferences/opac.pref | 16 +-
.../prog/en/modules/cataloguing/additem.tt | 1 +
.../bootstrap}/en/includes/columns_settings.inc | 3 +-
.../bootstrap/en/modules/opac-MARCdetail.tt | 4 +
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 186 ++++++++++----------
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 2 +-
opac/opac-detail.pl | 8 +-
opac/opac-shelves.pl | 9 +-
serials/serials-collection.pl | 8 +-
t/db_dependent/Circulation/MarkIssueReturned.t | 59 ++++---
t/db_dependent/Reports/Guided.t | 13 +-
19 files changed, 257 insertions(+), 139 deletions(-)
copy koha-tmpl/{intranet-tmpl/prog => opac-tmpl/bootstrap}/en/includes/columns_settings.inc (95%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list