[koha-commits] main Koha release repository branch 16.05.x updated. v16.05.04-29-g0fc92ab
Git repo owner
gitmaster at git.koha-community.org
Wed Oct 5 09:20:45 CEST 2016
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, 16.05.x has been updated
via 0fc92ab72d1bab7e84df9fc78e3cbd3f2abb3d97 (commit)
via 29ce6e481da7209ae9dae9dd8c73031bacd38883 (commit)
via 602b92795644ec9eab002542df5ee59b733d86e7 (commit)
via 5cd5b755cd846b0f4076472321920edc0a93f86e (commit)
via 3f235844498dab1719572e25a73d0c5fb7ffcd7b (commit)
via c73b60d7168f7f00226d01b09c604f253f35c36c (commit)
via e09f10a882d15118bd22789462b2d66f4b1a4dfb (commit)
via 20db7d6ee679f519a2076614635af831f3164c26 (commit)
via 4e8209d595137168667d81875d024e6954fea102 (commit)
via 3d0012e8fe98b910aace7da628c576fc1ba303ab (commit)
via b0949e921427decf879e8e20d26bf42fefce992d (commit)
via c81350b6200ce62c180f6fd301ed3406db893835 (commit)
via 8ec4b5b7d4c39a5db05fc13d384412d510206b44 (commit)
via 68c21aabe99fb12ef3987a142f5cc0389422a7bd (commit)
via fefd457550597e2bbcfda1317760c99852829ed2 (commit)
via 28eafe0b07fc8ec387ba6d7bd37dfadd5cdf01b6 (commit)
via 92d648f579fb03e1e5bed45e28c8604a2ea7aab0 (commit)
via 1ade46e5a4928ffd8ae4080b0f0f09c0b564ed13 (commit)
via 656a25e39cac5ecca5c95dd9b2ae65648d474528 (commit)
via 3b038239a56abc645eaa4787268b71a7b6603a5a (commit)
via 4e06090d8b0594d99da04824d239bcfa343f5e9c (commit)
via d46322c7cd30f6be6c6589de79577b720a408d3b (commit)
via 1dbc8e550e45a475ccbbc9d375c739307a6630bb (commit)
via 5a4a65cdbbf2f6cabd5b0979e4c5e969eb66e0fb (commit)
via 13705e51084f605a0e9fc686e7ee30350fb556e2 (commit)
via 4ab091d3bfd2c6659320cbe80d35b805cff3aa4e (commit)
via c27216cce84fe07c962a8878be51025c9fe0aace (commit)
via 06937c45855a18bafae74648c6a938c153c59bd9 (commit)
via 3f193fb63a3b8561088ee38a90ae32b9a1b276a5 (commit)
from ec82b4000e07ccf73eb174bd637707ae73ef3ef2 (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 0fc92ab72d1bab7e84df9fc78e3cbd3f2abb3d97
Author: Andreas Jonsson <andreas.jonsson at kreablo.se>
Date: Mon Oct 3 09:08:03 2016 +0100
Bug 17342: (bug 17262 follow-up) fix the way to retrieve memcached config from apache
The problem is that the memcached configuration variables are extracted
from the apache configuration file incorrectly so you get
'"127.0.0.1:11211"' including double quotes as the servers parameter to
memcached.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Note this only applies on 3.22.x but it does fix the problem
Definitely needed for 3.22.12
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 29ce6e481da7209ae9dae9dd8c73031bacd38883
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Aug 4 14:36:41 2016 -0400
Bug 17056 - Remove event attributes from various templates
This patch removes event attributes from several templates, moving event
definitions into the JavaScript instead.
To test, apply the patch and:
- View the MARC detail page for any bibliographic record. Changing the
framework selection should reload the display using the selected
framework.
- Perform the same test on the labeled MARC view. (Set the
viewLabeledMARC system preference to "Allow" if necessary).
- To test the changes to Reports you should have at least one report
group and at least one report subgroup.
- Create a new saved SQL report.
- Select a report group. Doing so should trigger the display of report
subgroups. Deselecting the report group should hide the subgroups.
- In Acquisitions -> Suggestions, create a new suggestion.
- In the 'Acquisition information' section, changing values for
copies, currency, and price should change the value in the total
field.
- In Circulation -> Upload offline circulation file:
- My patch for Bug 16602 added the required code but forgot to remove
the corresponding onclick attributes.
- Browse for an offline circulation file.
- Clicking the 'Upload file' button should work correctly.
- After uploading a file, both the 'Add to offline circulation
queue' and 'Apply directly' buttons should work to trigger their
corresponding processes (keeping Bug 16603 in mind).
Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 3d84252c0457708191adc23790d13dbf87e18a81)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 602b92795644ec9eab002542df5ee59b733d86e7
Author: Andreas Roussos <arouss1980 at gmail.com>
Date: Tue Sep 13 17:41:16 2016 +0300
Bug 9896 - Show vendor in subscription search when creating an order for a subscription
In the staff client, when creating an order from a subscription
the vendor name should be shown in a separate column.
This patch adds that feature. The 'Vendor' column is added before
the 'Library' column since they appear in that order in Advanced
search.
Test plan:
0) [PREREQUISITES] In the Staff client, under Acquisitions, create
a Vendor and associated Basket if you don't already have them.
Then, under Serials, add a new Subscription using the Vendor
you've just created.
1) Go to Acquisitions, and under 'Manage orders' search for a vendor,
then click on 'Add to basket' and select 'From a subscription'.
2) Click 'Search' on the left hand side to search for all subscriptions.
Notice how there is no 'Vendor' column in the results table.
3) Apply the patch.
4) Repeat step 2. Confirm that the patch works, i.e. there is now
a 'Vendor' column which displays the vendor name.
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit f57df28f96898f47a3c4c6e6a5520bcaaf7afe2e)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 5cd5b755cd846b0f4076472321920edc0a93f86e
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Sep 21 23:09:55 2016 +0000
Bug 17331 - Show holding branch in holds awaiting pickup report
This patch adds a holdingbranch column to waitingreseves.tt and
separates 'Location' into Home branch and callnumber columns
To test:
1 - Have some holds waiting and holds over
2 - View the report before the patch
3 - Note that location contains homebranch and call number
4 - View the report after the patch
5 - Note the new columns
6 - Ensure data is correct and no info has been lost
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as advertised
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Fixed 2 capitalization issues.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 98bca8f34b5fb739167d49868b317cbf16922bb1)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 3f235844498dab1719572e25a73d0c5fb7ffcd7b
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Sep 14 16:00:19 2016 -0300
Bug 17304: Introduce C4::Matcher::_get_match_keys unit tests
This function is used in several places, but it's behaviour is not covered by tests, thus trying to patch it can be problematic without introducing regressions.
This patch introduces unit tests for it, in the t/Matcher.t file.
To test:
- Apply the patch
- Run:
$ prove t/Matcher.t
=> SUCCESS: Tests pass
- Sign off :-D
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 5135b1a0a14ca958fe73505ed019bafe944dabc7)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit c73b60d7168f7f00226d01b09c604f253f35c36c
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Sun Sep 25 14:02:13 2016 +0000
Bug 14707 - DBRev 16.05.04.001
commit e09f10a882d15118bd22789462b2d66f4b1a4dfb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 14 11:07:58 2016 +0100
Bug 14707: Update existing installations and correct wrong values
See http://hea.koha-community.org/, the countries are filled is wrong
values.
If we decide to update the free text with a dropdown list, we need to
handle these wrong data.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 66d669d0735f244cb30e9cfdf53f91c77953b30f)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 20db7d6ee679f519a2076614635af831f3164c26
Author: Julian FIOL <julian.fiol at biblibre.com>
Date: Tue Aug 18 17:16:53 2015 +0200
Bug 14707 : Replace UsageStatsCountry syspref from free text to a dropdown list.
This will avoid syntax problems with Hea when a user will fill this 2 sysprefs
The default choice for UsageStatsLibraryType and UsageStatsCountry is 'empty'
Test Plan
---------
1. Create a new Koha install
2. Go to the 'Administration' page
3. Go to 'Global system preferences'
4. Go to 'Administration'
5. At the end of this page you should see a dropdown menu for
- UsageStatsCountry with all countries
- UsageStatsLibraryType with all type of library
They both should be empty by default.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Not a complete list but is a start
Lots of new strings to translate :)
No errors
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 233dfb8c74ce85bdb70bd1eb17231a234387d3c9)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 4e8209d595137168667d81875d024e6954fea102
Author: Zeno Tajoli <z.tajoli at cineca.it>
Date: Mon Sep 19 17:03:20 2016 +0200
Bug 13405 - System information has misleading information about indexing mode
With this patch when <zebra_bib_index_mode> or <zebra_auth_index_mode> are set to 'grs1'
it appears a link to https://wiki.koha-community.org/wiki/Switching_to_dom_indexing
instead of a misleading information.
To test:
a)Insert 'grs1' in <zebra_bib_index_mode> or <zebra_auth_index_mode> (file koha-conf.xml)
b)It appers a misleading warning
c)Apply the patch
d)It appears a link to https://wiki.koha-community.org/wiki/Switching_to_dom_indexing.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit cdac530034a6b478b95e2d99ddc171529ee1a6c7)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 3d0012e8fe98b910aace7da628c576fc1ba303ab
Author: Andreas Roussos <arouss1980 at gmail.com>
Date: Fri Sep 16 18:49:19 2016 +0300
Bug 17312 - Typo in members-toolbar.inc / moremember-brief.tt / moremember.tt
The following three templates are using [% guarantorborrowernumber %]
while they should be using [% guarantor.borrowernumber %]:
members/members-toolbar.inc
members/moremember-brief.tt
members/moremember.tt
This doesn't result in any breakage; just a couple of 'Edit' links that
do not pass the guarantorid in the URL, and one case where guarantor
information is not shown in the staff client.
This patch fixes that.
Test plan:
0) [PREREQUISITE] Create a patron with a guarantor if you don't have one.
1) Go to Home > Patrons and search for a patron that has a guarantor. In
the Details page for that patron, the 'Edit' link in the toolbar does
not pass the guarantor's id in the URL (...&guarantorid=&...).
2) In the same page, the 'Edit' link under the patrons name (immediately
under 'Guarantor') again does not include the guarantor id in the URL.
3) Go to Home > Patrons and click on 'New patron'. Pick any category from
the drop down menu. Enter the Surname, First name, and Date of birth
of the patron you used in step 1). This triggers the 'Duplicate patron
record?' warning -- click on 'View existing record' and notice how the
guarantor information is missing.
4) Apply the patch.
5) Repeat steps 1), 2), and 3) above. The URLs are fixed and patron info
is showing.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 0f4644a5bf7a43b117fbf6642b6db0479fdc58ed)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit b0949e921427decf879e8e20d26bf42fefce992d
Author: Andreas Roussos <arouss1980 at gmail.com>
Date: Sat Sep 10 11:54:06 2016 +0300
Bug 17289: Holds awaiting pickup shows date unformatted
In the Staff client, under Circulation -> Circulation reports,
the date shown in the heading of the 'Holds awaiting pickup'
report is not formatted according to the 'dateformat' system
preference.
This (trivial) patch fixes that.
Test plan:
1) In the Staff client, go to Circulation and under 'Circulation
reports' click on 'Holds awaiting pickup'
(cgi-bin/koha/circ/waitingreserves.pl).
2) Observe that the date shown in the heading is always formatted as
yyyy-mm-dd regardless of the value of the 'dateformat' syspref.
3) Apply the patch.
4) Re-visit the 'Holds awaiting pickup' report. Confirm that the patch
worked, i.e. the date shown in the heading is formatted according
to the 'dateformat' system preference.
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as advertised
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit f9e3639da7ef02a6ca08014179d216e1d938a401)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit c81350b6200ce62c180f6fd301ed3406db893835
Author: Rafal Kopaczka <rkk0 at poczta.onet.pl>
Date: Sat Sep 3 18:06:47 2016 +0200
Bug 17245: Untranslatable abbreviated names of seasons.
Because seasons strings are not available through DateTime module,
names of them where added in code, and templates. Bug 16289 adds new
abbreviated form to the code, but not to the templates. This patch
should fix the problem.
To test:
1. Apply patch.
2. Run "misc/translator/translate update" for you language.
3. Check if names are in po/ file for language.
4. Check if generating next issue for serial and prediction patterns
works correct.
NOTE: or "create {language code}" instead of update.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 4da3bf5e48fa3462d2f3eca0f3c45f64dc9bb5b2)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 8ec4b5b7d4c39a5db05fc13d384412d510206b44
Author: Marc Véron <veron at veron.ch>
Date: Tue Sep 20 16:11:22 2016 +0200
Bug 17322 - Translation breaks opac-ics.tt
This patch adds newlines to opac-ics.tt that are preserved by the translating process.
To test:
- Apply patch
- Create a translation (perl translate xy-XY)
- With a text editor or poedit, translate misc/translator/po/xy-XY-opac-bootstrap.po
(it is enough to translate "%s %s %s %s is overdue %sYour copy of........")
- Install language xx-XY and select it for OPAC (perl translate install xy-XY)
- Make sure you have at least a couple of loans, including one overdue
- Go to /cgi-bin/koha/opac-user.pl and click on the link labeled "Download as
iCal/.ics file"
- Inspect the file in a text editor and/or view the result in a calendar
appplication. Make sure the data makes sense. Compare it to the english version.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 756c0f93187174f22d95825f51c4dfa21b11803a)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 68c21aabe99fb12ef3987a142f5cc0389422a7bd
Author: Andreas Roussos <arouss1980 at gmail.com>
Date: Thu Sep 15 11:37:19 2016 +0300
Bug 10768 - Improve the interface related to itemBarcodeFallbackSearch
When the itemBarcodeFallbackSearch syspref is on, the wording in the
interface should reflect that you can enter a barcode OR a keyword.
Additionally, in the results of a keyword search the "Fast cataloging"
link should be more descriptive. This patch fixes these issues.
Test plan:
0) [PREREQUISITES] Ensure you have a Fast Add ('FA') framework defined,
and that your itemBarcodeFallbackSearch syspref is set to 'Enable'.
1) Go to Circulation -> Check out, search for a patron, then select a
patron to Check out. Notice how the text above the textbox reads
"Enter item barcode:".
2) Type something generic (not a barcode) in the textbox so that you'll
get at least one item as a result. Notice how the text in the yellow
warning box reads "The barcode was not found: <terms> Fast cataloging".
3) Apply the patch.
4) Repeat step 1), now the text above the textbox should read
"Enter item barcode or keyword:".
5) Repeat step 2), now the text in the yellow warning box should read
"The barcode was not found: <terms> Add record using fast cataloging".
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 6fc03f1968f9e405d745b854577c953106fdbdfe)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit fefd457550597e2bbcfda1317760c99852829ed2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 13 14:41:51 2016 +0100
Bug 16816: Do not copy parameters used when duplicating a report
If a report is duplicated from the report list, the new report will
contain the tag (<<YEAR>> for instance), but from the reports results
page it copies the values used for the results.
Test plan:
Create a new sql report with tags
Duplicate it from the report list: no expected changes
Run it and duplicate it: the tags must not have been replaced
Signed-off-by: Andreas Roussos <arouss1980 at gmail.com>
Ran and duplicated a report, the tags remained intact.
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 50a37fbf5bc22bed843447be6a6603e7705fd28d)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 28eafe0b07fc8ec387ba6d7bd37dfadd5cdf01b6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 14 14:41:20 2016 +0100
Bug 17300: Fix serials search
Since bug 16157, the location value is always "All" and the serial
search won't return anything.
Test plan:
Search for some serials.
Without this patch, it won't return any results
With this patch applied, the result search should be consistent
Reproduced with serial's "Advanced search" and search filter in
left hand column. Fixed by this patch.
Signed-off-by: Marc <veron at veron.ch>
Advanced search works fine again.
Signed-off-by: Andreas Roussos <arouss1980 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 613c83f4e3e92d9f5a51fd2d5eccefd0dd6d00de)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 92d648f579fb03e1e5bed45e28c8604a2ea7aab0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 14 13:39:34 2016 +0100
Bug 17296: Display warning if AnonymousPatron is not correctly set
Bug 14655 added a warning to the about page ("System information" tab)
if the AnonymousPatron feature is not correctly configured.
But actually there is one case when it's not displayed.
Test plan:
Set AnonymousPatron to a non existing patron
Set at least 1 borrowers.privacy == 2
go on the about page.
Without this patch you do not get the warning
With this patch you will see "Some patrons have requested a privacy on
returning item but the AnonymousPatron pref is not set correctly. Set it
to a valid borrower number if you want that this feature works
correctly."
Signed-off-by: Marc <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 1a2d804a8094ea05199803593698b4294f029913)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 1ade46e5a4928ffd8ae4080b0f0f09c0b564ed13
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 13 09:44:41 2016 +0100
Bug 17294: Make reserves_stats.pl plack safe
Lot of errors are raised by this script under plack because of var scope
issues:
Variable "$ccodes" is not available at
/home/koha/src/reports/reserves_stats.pl line 337.
Variable "$locations" is not available at
/home/koha/src/reports/reserves_stats.pl line 338.
Variable "$itemtypes" is not available at
/home/koha/src/reports/reserves_stats.pl line 339.
Variable "$Bsort1" is not available at
/home/koha/src/reports/reserves_stats.pl line 344.
Variable "$Bsort2" is not available at
/home/koha/src/reports/reserves_stats.pl line 350.
Variable "@patron_categories" is not available at
/home/koha/src/reports/reserves_stats.pl line 356.
The lazy way to fix that is that reinit them from the subroutines they
are used.
Test plan:
Execute the report, after this patch applied you won't see the error in
the log.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit f66cc4dfcca243e6210c3323586efbfbd6cfe0cd)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 656a25e39cac5ecca5c95dd9b2ae65648d474528
Author: Marc Véron <veron at veron.ch>
Date: Thu Aug 18 14:14:47 2016 +0200
Bug 17144: Fix variable scope issues in edi_account.pl
To reproduce:
- In Staff client, go to Administration > EDI accounts
- Click "+ New account"
Result: Internal Server Error
Plack error log says:
Can't call method "param" on an undefined value at /home/marc/koha/admin/edi_accounts.pl line 157
To test:
-Apply patch
- Add an EDI account
- Edit an EDI account
- Delete an EDI account
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit a055abe7c06e2efc9f0cdae89c2cbef28b7f3cb3)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 3b038239a56abc645eaa4787268b71a7b6603a5a
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Tue Aug 9 12:58:47 2016 +0200
Bug 17085 - Specify libmojolicious-perl min version
Set min version for libmojolicious-perl to 6.0 and regenerate debian/control
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 53f8916fe70f9401923872b7fcd05f63a1e5fdf1)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 4e06090d8b0594d99da04824d239bcfa343f5e9c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 20 10:03:42 2016 +0100
Bug 17316: Do not display the list's name if the user does not have permission - Staff
Same as previous patch but for the staff interface
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit d26cda6f9e7e52bb899717ffe5f84c31b46feefc)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit d46322c7cd30f6be6c6589de79577b720a408d3b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 20 09:55:25 2016 +0100
Bug 17316: Do not display the list's name if the user does not have permission - OPAC
At the OPAC, if a user manipulate the URL to show a list (s)he is not
allowed to view, the list's name will be displayed anyway.
Test plan:
- Create a private list with user A
- Copy the op=view URL and access it with user B logged in
=> Without this patch, you will see the rss icon, the list's name and
the "add list" button
=> Without this patch, only the "unauthorized" box will be displayed
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 31ca4849efd5539c6b287047ce2da560be7e1c53)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 1dbc8e550e45a475ccbbc9d375c739307a6630bb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 20 11:06:23 2016 +0100
Bug 17315: (Bug 17210 follow-up) Fix "Save to lists" links from the result page
On bug 17210, the selector .addtoshelf should not have caught the
.addtoshelf nodes from the result list.
To fix this, we just need to make the selector more specific (and cannot
reuse it without more changes, the biblionumber variable is not the same
- vs SEARCH_RESULT.biblionumber).
Test plan:
Make sure the 2 links (from detail and search result) "Save to lists"
and "Save to your lists" work as expected.
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit e422de7b62322b2637ac5623d102563dd3e82b36)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 5a4a65cdbbf2f6cabd5b0979e4c5e969eb66e0fb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 14 09:20:01 2016 +0100
Bug 16800: Fix XSS in additem.pl
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 9734726846f6fa652d88c8bc39c7b43595422465)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 13705e51084f605a0e9fc686e7ee30350fb556e2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 2 16:05:09 2016 +0100
Bug 16800: Fix XSS in catalogue/*detail.tt - isbn
Test plan:
catalogue a bibliographic record with a isbn=
</title><script>alert('XSS')</script>
Go on the detail pages.
=> Without this patch you will see the alert
=> With this patch, no more alert
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 4ab091d3bfd2c6659320cbe80d35b805cff3aa4e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 2 16:03:37 2016 +0100
Bug 16800: Fix XSS in catalogue/*detail.tt - author
Test plan:
catalogue a bibliographic record with a author=
</title><script>alert('XSS')</script>
Go on the detail pages.
=> Without this patch you will see the alert
=> With this patch, no more alert
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 3169434cfa7295025e4ff5fea58f7e9730a96650)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit c27216cce84fe07c962a8878be51025c9fe0aace
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 2 16:02:07 2016 +0100
Bug 16800: Fix XSS in catalogue/*detail.tt - title
Test plan:
catalogue a bibliographic record with a title=
</title><script>alert('XSS')</script>
Go on the detail pages.
=> Without this patch you will see the alert
=> With this patch, no more alert
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
This of course means that any html in the title will no longer be
evaluated. :
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 515208d5ec308ade967efe04388bbedbf5f2b057)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 06937c45855a18bafae74648c6a938c153c59bd9
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Sep 13 14:42:32 2016 -0300
Bug 2389: (followup) Add documentation and fix use case
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Barton Chittenden <barton at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 9e22a9ced3db2ba0f27d45a551b455095cb910e5)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
commit 3f193fb63a3b8561088ee38a90ae32b9a1b276a5
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jul 15 10:18:13 2016 -0300
Bug 2389: Add --test switch to overdue_notices.pl
This patch adds the --test option switch to the overdue_notices.pl script
so it can be ran without doing any actual action.
To test:
- Have a patron with overdue items (simulate a checkout for a past date. Note it implies
that the circ rules are defined so the patron is overdue)
- Run:
$ sudo koha-shell kohadev
koha-dev$ misc/cronjobs/overdue_notices.pl --test
=> SUCCESS: The script is ran but the patron isn't debarred and no notice messages are queued.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Barton Chittenden <barton at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 71454b4263f6e883f7e6246de06291531a7d5757)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
-----------------------------------------------------------------------
Summary of changes:
C4/Serials.pm | 1 +
Koha.pm | 2 +-
admin/edi_accounts.pl | 6 +-
debian/control | 4 +-
debian/list-deps | 1 +
debian/scripts/koha-functions.sh | 4 +-
installer/data/mysql/sysprefs.sql | 4 +-
installer/data/mysql/updatedatabase.pl | 50 +++++
.../prog/en/includes/av-build-dropbox.inc | 2 +-
.../prog/en/includes/members-toolbar.inc | 2 +-
.../prog/en/includes/reports-toolbar.inc | 2 +-
.../prog/en/includes/virtualshelves-toolbar.inc | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 12 +-
.../prog/en/modules/acqui/newordersubscription.tt | 4 +
.../prog/en/modules/admin/preferences/admin.pref | 215 +++++++++++++++++++-
.../prog/en/modules/catalogue/ISBDdetail.tt | 2 +-
.../prog/en/modules/catalogue/MARCdetail.tt | 7 +-
.../prog/en/modules/catalogue/detail.tt | 12 +-
.../prog/en/modules/catalogue/labeledMARCdetail.tt | 11 +-
.../prog/en/modules/catalogue/moredetail.tt | 6 +-
.../prog/en/modules/cataloguing/additem.tt | 6 +-
.../prog/en/modules/circ/circulation.tt | 8 +-
.../prog/en/modules/circ/waitingreserves.tt | 18 +-
.../prog/en/modules/members/moremember-brief.tt | 4 +-
.../prog/en/modules/members/moremember.tt | 4 +-
.../prog/en/modules/offline_circ/process_koc.tt | 4 +-
.../en/modules/reports/guided_reports_start.tt | 5 +-
.../prog/en/modules/serials/serials-collection.tt | 8 +
.../en/modules/serials/showpredictionpattern.tt | 8 +
.../prog/en/modules/suggestion/suggestion.tt | 13 +-
.../prog/en/modules/virtualshelves/shelves.tt | 2 +-
.../bootstrap/en/includes/opac-bottom.inc | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-ics.tt | 7 +-
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +-
misc/cronjobs/overdue_notices.pl | 18 +-
opac/opac-shelves.pl | 1 +
reports/guided_reports.pl | 5 +-
reports/reserves_stats.pl | 6 +
t/Matcher.t | 163 ++++++++++++++-
virtualshelves/shelves.pl | 1 +
40 files changed, 557 insertions(+), 77 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list