[koha-commits] main Koha release repository branch master updated. v17.11.00-1055-gc3f9b75
Git repo owner
gitmaster at git.koha-community.org
Wed Apr 4 21:16:20 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 c3f9b750e22b87f6f699bf608cc90fa91cd1ef58 (commit)
via 18e02913a0eaf0b94421027dbcfc0965499b15a8 (commit)
via 36db911da09f83131f82db6f8ed50ec1ad2f0029 (commit)
via 65b71667c0bdef7e4fb04e4a747c99af2bcf2e5d (commit)
via 6611ad4f05f8b236842940189ecd5ded88dc3d85 (commit)
via e2214f2b256e0a44e0936d3eb8e87ac02b40917e (commit)
via 195f5404e4fc665f95e3f686494e7e0f298e27e1 (commit)
via 4376db33b5acbc49ebdfe3e98afa9f1126634934 (commit)
via d407221be6ec07b8323935370fe07b5ff4dc9d80 (commit)
via 32c562bbe0383fe50a65aed7a18f82336e6d53c7 (commit)
via c45246053639c216b598385a2f89cf723277a3c5 (commit)
via b1f2c84e5078c2aa77e428ca359aef4df952944a (commit)
via 9a76781f9ef0ba997fdaf79d78648a6c41827f03 (commit)
via f8ce3d88b18ece5c04fbe923a37ce7a9aa715c3c (commit)
via 0ab51a509a2a9d0ced3b2ccd9ff154f670f27560 (commit)
via 1c4ac7dac8b8dece9afd2330077aeda82dddc1c1 (commit)
from 8538886cb91f977d6109bfd035d4d8348ad108dc (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 c3f9b750e22b87f6f699bf608cc90fa91cd1ef58
Author: Victor Grousset <victor.grousset at biblibre.com>
Date: Fri Jan 5 15:03:38 2018 +0100
Bug 19953: Record page: acquisition details: add column for invoice
Test plan:
1. create a vendor with minimal info
2. create a basket with minimal info
3. add a item to the basket
4. close the basket
5. receive a shipment
6. on the "receipt summary" click on "receive" for the wanted item (it
should be the only one)
7. items → receive? → tick this checkbox
8. save
9. click on "finish receiving"
10. go to the record → Acquisition details
11. apply this patch
12. refresh the page
13. you should see the new column
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 18e02913a0eaf0b94421027dbcfc0965499b15a8
Author: Jesse Weaver <jweaver at bywatersolutions.com>
Date: Mon Jul 18 16:31:20 2016 -0600
Bug 19267: Rancor - Warn before leaving page if record modified
To test:
1 - Open the advanced editor
2 - Make some changes to a record
3 - Click on 'Patrons' or leave the page in some way
4 - Note there is no warning and changes are not saved
5 - Apply patch
6 - Open the advanced editor
7 - Make some changes
8 - Leave the page
9 - Note you get a warning of unsaved changes and can stay on the page
Signed-off-by: Charles Farmer <charles.farmer at inLibro.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 36db911da09f83131f82db6f8ed50ec1ad2f0029
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Dec 14 07:03:39 2017 -0500
Bug 19812: Fix confusing holds count values in "Already received" table
In acqui/parcel.pl both the "Pending orders" and "Already received" tables show how many holds there are for the given record. However, the count of holds in the "Pending orders" table confuses librarians because it only lists holds for the particular items in the orderline. Due to that, the holds column may show 0 holds even if there are a dozen record level holds for that bib! This is not what librarians seem to expect, instead it seems that the same total holds in the "Pending orders" table would be preferred.
Test Plan:
1) Find an invoice with an item in the "Already received" table
2) Add one or more record level holds to the record
3) Note the holds column does not count those holds
4) Apply this patch
5) Note the holds column now shows total holds and holds for just those ordered items
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nancy Keener <nkeener at washoecounty.us>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Bug 19812: (QA follow-up) Swap sides for total and item holds
Bug 19812: (QA follow-up) If 0 holds show '0' not '0 / 0'
Bug 19812: (QA follow-up) Remove unnecessary line
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 65b71667c0bdef7e4fb04e4a747c99af2bcf2e5d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Apr 4 15:54:58 2018 -0300
Bug 19910: Use span to make translators happy
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6611ad4f05f8b236842940189ecd5ded88dc3d85
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jan 3 14:07:17 2018 +0000
Bug 19910: Use the delimiter syspref to name download link
To test:
1 - Set delimiter syspref to anything but comma
2 - Download report results as comma separated text
3 - They actually follow the syspref
4 - Apply patch
5 - Download link should now match pref selection
6 - Change pref, note link changes
7 - Verify things still work as expected
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Victor Grousset <victor.grousset at biblibre.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 e2214f2b256e0a44e0936d3eb8e87ac02b40917e
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Wed Jan 17 14:30:06 2018 -0500
Bug 20008: Fix restrictions added from memberentry.pl if TimeFormat is 12hr
Test Plan:
1) Set TimeFormat to 12 hour
2) Add a restriction with an expiration date via memberentry.pl
3) Note the restriction exists, but has no expiration date
4) Apply this patch
5) Repeat step 2
6) Note the restriction exists and has an expiration date!
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 195f5404e4fc665f95e3f686494e7e0f298e27e1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Mar 29 12:14:11 2018 -0300
Bug 20115: Add information about this feature in the pref descriptions
I guess a native English speaker will have a better wording :)
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4376db33b5acbc49ebdfe3e98afa9f1126634934
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 15 11:42:22 2018 -0300
Bug 20115: Remove sort on rfc4646_subtag in OPAC templates
Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d407221be6ec07b8323935370fe07b5ff4dc9d80
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jan 31 14:06:23 2018 -0300
Bug 20115: Trigger "modified" when sort is changed
Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 32c562bbe0383fe50a65aed7a18f82336e6d53c7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jan 31 13:47:46 2018 -0300
Bug 20115: Make the prefs sortable
If we depend on the order, we should make it sortable.
I let the customization to someone else (we would need an icon to tell
the user it's sortable).
Something does not work here:
If fr-FR and fr-CA is installed, but only 1 is ticked, it will be
considered as last. I do not think it's a blocker as it does not make
really make sense to have it installed but not used (the interface is
also weird, there is a dropdown list with only 1 entry)
Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c45246053639c216b598385a2f89cf723277a3c5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jan 31 13:47:37 2018 -0300
Bug 20115: Set the languages order with the pref values
To avoid the languages to be ordered randomly, it is better to stick on
a default order.
Let's suppose that the order in the pref is correct.
Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b1f2c84e5078c2aa77e428ca359aef4df952944a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Nov 6 15:35:50 2017 -0300
Bug 19578: Remove MARC punctuation in notices (TT syntax)
Jenkins fails (run 287) on a test in t/db_dependent/Letters/TemplateToolkit.t:
With the historical syntax:
# Your request for an article from tQYRS (c3Av58O0P5xkkIGu) has been canceled for the following reason:
With the TT syntax:
# Your request for an article from tQYRS_ (c3Av58O0P5xkkIGu) has been canceled for the following reason:
The last character of the biblio's title has been removed because it's a punctuation character.
It comes from: C4::Letters::_parseletter
893 $val =~ s/\p{P}$// if $val && $table=~/biblio/;
The same replacement is done for patron's attributes too.
Test plan:
- Confirm that the new tests pass. That should be enough to confirm this change make sense.
Test plan (manual):
- Create a biblio with a title ending with a punctuation (like "with_punctuation_"), or any other fields of biblio/biblioitem
- Generate a notice which will display this field (CHECKIN for instance)
Use the historical syntax and the TT syntax, both should display the title without the punctuation character at the end
CHECKIN historical:
The following items have been checked in:
----
<<biblio.title>>
----
CHECKIN TT syntax:
The following items have been checked in:
----
[% biblio.title %]
----
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9a76781f9ef0ba997fdaf79d78648a6c41827f03
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue Jan 30 22:35:39 2018 +0000
Bug 20083: (follow-up) use same logic in opac-showmarc
It was correctly pointed out that opac-showmarc would leak
the same way as catalogue/showmarc.pl, and so this patch
moves the authentication step up to the top where it
should be so as to prevent inappropriate data leaks.
TEST PLAN
---------
1) Set your OpacPublic system preference to Disabled
2) Open your OPAC and login
3) Find a biblio with items
4) Go to the opac details, particularly MARC view.
5) Copy the "view plain" shortcut link.
6) log out.
7) Paste the link into the address bar.
-- the information will leak!
8) apply the patch
9) restart_all
10) Refresh the OPAC link
-- log in screen will appear.
11) run koha qa test tools
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 f8ce3d88b18ece5c04fbe923a37ce7a9aa715c3c
Author: Andreas Roussos <arouss1980 at gmail.com>
Date: Fri Jan 26 14:12:47 2018 +1300
Bug 20083: Information disclosure when (mis)using the MARC Preview feature
The MARC Preview feature in the Staff client (catalogue/showmarc.pl) does not
check whether a user is logged in or not. As a consequence, it can be used to
obtain information that would normally be available to logged-in users only.
For example, you can view any bibliographic record by passing a value to the
'id' argument, but you can also view records as they were imported (normally
done via the 'Staged MARC management' tool).
All three 17.11 installations currently listed at
https://wiki.koha-community.org/wiki/Koha_Demo_Installations
are affected by this issue, as demonstrated by the URLs below:
http://koha.adminkuhn.ch:8080/cgi-bin/koha/catalogue/showmarc.pl?importid=1&viewas=html
http://pro.demo1711-koha.test.biblibre.eu/cgi-bin/koha/catalogue/showmarc.pl?id=1000&viewas=html
https://staff-kohademo.equinoxinitiative.org/cgi-bin/koha/catalogue/showmarc.pl?id=1&viewas=html
It should be noted that this only applies to XSLT-enabled installations.
Signed-off-by: Mark Tompsett <mtompset at hotmail.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>
commit 0ab51a509a2a9d0ced3b2ccd9ff154f670f27560
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Mar 27 15:56:57 2018 -0300
Bug 19223: Add methods to correctly handle plugin-generated output
This patch introduces two methods to be used by plugin authors:
->output
->output_html
They are basically wrappers for the helper methods from C4::Output
(output_html_with_http_headers and output_with_http_headers).
Plugin authors can use them, or keep the current flexibility of handling
the headers themselves in their code.
The KitchenSink plugin should be updated to highlight this.
To test:
- Run:
$ kshell
k$ prove t/db_dependent/Plugins.t
=> FAIL: The methods are not implemented
- Apply this patch
- Run:
k$ prove t/db_dependent/Plugins.t
=> SUCCESS: Tests pass, and they are meaningful
- Sign off :-D
Sponsored-by: ByWater Solutions
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1c4ac7dac8b8dece9afd2330077aeda82dddc1c1
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Mar 27 15:56:41 2018 -0300
Bug 19223: Unit tests for output and output_html methods
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Languages.pm | 12 +++++-
C4/Letters.pm | 26 +++++++++++-
Koha/Plugins/Base.pm | 43 +++++++++++++++++++-
.../Template/Plugin/Remove_MARC_punctuation.pm | 22 +++++-----
acqui/parcel.pl | 4 +-
catalogue/showmarc.pl | 21 +++++-----
.../prog/en/includes/cateditor-ui.inc | 7 ++++
.../prog/en/includes/delimiter_text.inc | 8 ++++
.../prog/en/includes/reports-toolbar.inc | 3 +-
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 12 ++++--
.../prog/en/modules/admin/preferences.tt | 4 +-
.../en/modules/admin/preferences/i18n_l10n.pref | 2 +
.../prog/en/modules/catalogue/detail.tt | 12 ++++++
.../intranet-tmpl/prog/js/pages/preferences.js | 6 +++
.../bootstrap/en/includes/masthead-langmenu.inc | 2 +-
.../bootstrap/en/includes/opac-bottom.inc | 2 +-
members/memberentry.pl | 3 +-
opac/opac-showmarc.pl | 14 +++----
t/Koha/Plugin/Test.pm | 10 +++++
t/db_dependent/Letters/TemplateToolkit.t | 42 ++++++++++++++++++-
t/db_dependent/Plugins.t | 30 +++++++++++++-
21 files changed, 242 insertions(+), 43 deletions(-)
copy cataloguing/plugin_launcher.pl => Koha/Template/Plugin/Remove_MARC_punctuation.pm (71%)
mode change 100755 => 100644
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/delimiter_text.inc
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list