Owen Leonard [Tue, 31 May 2016 14:08:03 +0000 (10:08 -0400)]
Bug 16127 - Add discharge menu item to patron toolbar
This patch changes the "Discharge" menu in the patron sidebar to read
"Discharges," and adds a "Discharge" menu item to the patron toolbar.
This adds some redunancy, but fits with the pattern of including "views"
in the sidebar and "actions" in the menu. The discharge feature can be
thought of either way.
To test you must have the 'useDischarge' system preference enabled.
- View the detail page for any patron.
- Confirm that the sidebar menu reads "Discharges."
- Confirm that the "More" menu contains a "Discharge" link which works
correctly.
Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 981302a47322857b080107a71c47db2345ef5286) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 43b4a740dcc5a13e1726a15da14493b57366a0e8) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Tue, 14 Jun 2016 10:18:32 +0000 (11:18 +0100)]
Bug 16717: Improve variable naming
$category was a categorycode, to help the readability it's better to
name it $categorycode or assign a Category to $category
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f8b73deaec5c7f55d66d52c2ca05d419f4a7c178) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 8ebe3a0a42b8b63a3ef8b1486a30cd3b335d12b9) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marcel de Rooy [Fri, 27 May 2016 11:48:10 +0000 (13:48 +0200)]
Bug 16717: Remove hardcoded category from Holds.t
There is actually no need to use the hardcoded patron category S in
this test.
Test plan:
Run t/db_dependent/Holds.t.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Test passes OK Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a4690353d9a20a7c991787a1ffe3040eb3834a5a) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 5321959b458b39860192846cd466a05df893aa53) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
The update_dbix_class_files.pl script generates ActionLog.pm instead, which is
already on the source tree.
To test:
- Apply the patch
=> SUCCESS: Koha/Schema/Result/ActionLogs.pm is removed
- Run:
$ mysql -uroot
> CREATE DATABASE dbic; \q
$ mysql -uroot dbic < kohaclone/installer/data/mysql/kohastructure.sql
$ misc/devel/update_dbix_class_files.pl --db_name dbic --db_user root
=> SUCCESS: Koha/Schema/Result/ActionLogs.pm is not re-generated
- Run:
$ git grep ActionLogs
=> SUCCESS: There's no code using it
- Sign off
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b8c950a4c1b1ead8a58686b27c95f9891cdccbae) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit c0d3e6db1191e2bb63da70cf1d3280f25efe7bfa) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Mon, 6 Jun 2016 12:31:29 +0000 (13:31 +0100)]
Bug 16670: (bug 15823 follow-up) CGI->param should not be called in list context
Signed-off-by: Jacek Ablewicz <abl@biblos.pk.edu.pl> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 58207446755cb2533fac48252c3b70154b164feb) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 302ac5e2a88d73601ee36fcc7460beca281b6fb7) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marcel de Rooy [Mon, 23 May 2016 07:03:23 +0000 (09:03 +0200)]
Bug 16502: Replace a few other ok-calls by is-calls
Trivial changes that speak for themselves..
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 8204024f1c21102c0649dec70d10398131aab953) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 2b7a9479b601e224ff6cdbdcc3162426a4727406) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marcel de Rooy [Mon, 23 May 2016 06:58:02 +0000 (08:58 +0200)]
Bug 16502: Adjust test for GetPlugins
The current test assumes that GetPlugins will return the test plugin
as the first one in the array. This is not correct.
This patch adjusts the test to a grep.
Test plan:
Run the test.
Bonus: Add additional plugins. Run the test again.
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 6ad5770786c6646ce68ffdfec9080645fc25772e) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 64382be0d45ad6d43bb86bda095ca1a3699d1265) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marcel de Rooy [Mon, 16 May 2016 17:00:16 +0000 (19:00 +0200)]
Bug 16502: Add additional test to Plugins.t
In order to verify if the delete now really works, we add one test
in Plugins.t.
Test plan:
[1] Run the test.
[2] Bonus: Comment line 63 in Plugins.t where delete is called.
Run the test again. It should fail now.
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 959d69fa0107423ed31e20f4a6afb46d1e5c771c) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 0632256c1aca919ec055dd5f170ac10d84cc8ec7) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marcel de Rooy [Mon, 16 May 2016 15:19:54 +0000 (17:19 +0200)]
Bug 16502: Table koha_plugin_com_bywatersolutions_kitchensink_mytable not always dropped after running Plugin.t
If you run Plugin.t, the above table will still be present (when you
did not enable UseKohaPlugins). This would trigger a warning when
running the test a second time.
Why? The uninstall call does its work not completely due to a small
inconsistency in Koha::Plugins::Handler::delete when calling run
without the enable_plugins parameter.
This patch resolves that inconsistency and also removes an unneeded skip
in Plugin.t in case the KitchenSink module already exists.
Note: This is a small fix. But I wonder if the Handler routines run and
delete should not have been implemented in Koha::Plugins::Base.
Also note that plugins/plugins-uninstall.pl will not be affacted by this
change, since it checks whether the pref is enabled before calling the
delete method.
Test plan:
[1] Do not yet install this patch.
[2] Verify that plugins are enabled in koha-conf.xml.
[3] Disable UseKohaPlugins in System Preferences!
[4] Run t/db_dependent/Plugins.t.
[5] Verify that table koha_plugin_com_bywatersolutions_kitchensink_mytable
still exists. (It should have been deleted.) Remove it manually.
[6] Apply this patch.
[7] Run the test again.
[8] Verify that the table does not exist.
[9] Run the test again (without warnings).
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 4263ac2b92737024d8d620a751babf72b904b73a) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 4ebe7b489c9798d2456bd3de1d95ec6e027b2b21) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
On running all Items-related tests some useless diag showed up. Removing it.
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit de6c1375f76b562970d7515192a002af8babc740) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 5185adc1bae9241f919c8ecd5fc98c4b0b6bd6a4) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Tue, 3 May 2016 10:08:47 +0000 (11:08 +0100)]
Bug 13074: Use Koha::Cache to cache the defaults values of a MARC record
With the global %default_values_for_mod_from_marc variable, the changes
made to the marc_subfield_structure table and especially the links
between MARC and DB fields are not safe and might be outdated (if a
field is linked/unlinked)
Test plan:
Under Plack:
- Link the barcode field, edit a record and set a barcode.
- Remove the mapping for the barcode field and then update again the
barcode of the record.
The items.barcode DB field must not have been updated.
Without this patch, the field should have been updated.
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 8c14c25521eac92a2cb62ab5330deac2e2d5343d) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a50e5f141b14c1ba6f9c491a40db1270a8c7be99) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Tue, 14 Jun 2016 09:49:41 +0000 (10:49 +0100)]
Bug 12748: findSerialByStatus has been renamed with findSerialsByStatus
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 30946eff3cda31d0cc97c6c1c4f1e757dbc4c366) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 9710f07575ea7a56000058a687b1a9e835396b86) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Tue, 14 Jun 2016 09:43:14 +0000 (10:43 +0100)]
Bug 12748: Code tidy
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 44062c07b7703190b46701a3fa31665d998eadfb) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 69e4c39c213192b46c4e231d40b7a34d676e6b4a) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Tue, 14 Jun 2016 09:39:08 +0000 (10:39 +0100)]
Bug 12748: Remove warning 'masks earlier declaration in same scope'
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 273d5e53289536797281ca5eb323d5c373d9ea41) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 67b4f25a69b370bb441ed09555ef49e0dd2a1e10) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 1bd5a177d0870332a959e9c773aaec80beeba74b) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 2351db01d32726809e2a00b2c8020e497c2c3931) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
remi [Tue, 11 Aug 2015 15:10:45 +0000 (11:10 -0400)]
Bug 12748 - Fixes duplicate serials with an "expected" status bug
Added a new sub to Serials.pm to be able to get serials with their statuses.
Now the sub ModSerialStatus checks for other serials with an "expected" status before doing anything.
Also modified Serials.t to be able to test those changes.
Test Plan
1) Apply patch
2) Run ./t/db_dependent/Serials.t
3) Validate that there are no errors
4) Go on "Serial collection information" page for a serial of your choice
5) Click on "Generate next"
6) Change the status of the original serial from "late" to "expected"
7) Change the newly generated serial from "expected" to "delete"
8) Validate that there are no new serials created by instruction 7 and that the serial was deleted
9) Run ./t/db_dependent/Serials.t
With QA Fixes
- Use the constant instead of the code (1 vs EXPECTED)
- Avoid interpolation in query
- use selectall_arrayref instead of fetchall_arrayref
Signed-off-by: Liz Rea <liz@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 10fd9f5ec0d5faa7b54b0bfaf5a7b8fccd665f0a) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 695dc4c370d4d170b41447c583c8bfe91b0609e2) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Tue, 7 Jun 2016 09:20:53 +0000 (10:20 +0100)]
Bug 10459: Add tests for borrowers.updated_on
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit ff9de4138a7544f08f835acae93aca124c8efa89) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit b68e1038feffc75b1c81cee193e80564213f30d3) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Mark Tompsett [Thu, 26 May 2016 01:57:34 +0000 (21:57 -0400)]
Bug 10459 renamed timestamp to updated_on
Signed-off-by: Joy Nelson <joy@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f863e478b994f2631d79821473c773099dc78172) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 947690e2324c72cba4ceca8790a98bcdf30752a8) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marcel de Rooy [Mon, 10 Nov 2014 13:17:40 +0000 (14:17 +0100)]
Bug 10459: Borrowers should have a timestamp
This patch adds a timestamp column to the borrowers table in kohastructure
and updatedatabase. (And also to the deletedborrowers table.)
A timestamp may be useful in synchronizing with external systems (among other
reasons).
Test plan:
Run updatestructure on an existing database, or install a new one.
Verify that the borrowers table has a timestamp now.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested updatestructure and running kohastructure.sql.
Passed t/db_dependent/Members.t.
updatedatabase.pl did not apply. I edited and then run it. Columns were added as expected. Signed-off-by: Marc Veron <veron@veron.ch> Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
Bug 10459: Follow up to update to atomic update methodology
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
New column created, no errors.
Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Joy Nelson <joy@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 255596ae6c483caf5746745f3656b56e0ea011b4) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit b4d40f7d00b38eeb006da58f016a109abae6235b) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marcel de Rooy [Mon, 2 May 2016 10:26:44 +0000 (12:26 +0200)]
Bug 16412: Cache undef in L1 only
No need to cache undef in L2.
Prevent numerous warnings like:
Use of uninitialized value in subroutine entry at /usr/share/koha/masterclone/Koha/Cache.pm line 284
Test plan:
Run t/Cache.t
Run t/db_dependent/sysprefs.t
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch: remove trailing space char and replace 'you' with 'we' to
match existing wordings.
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit 7a452ac4149809c212d861ee8b08c3931f23234a) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Fri, 8 Apr 2016 12:37:46 +0000 (13:37 +0100)]
Bug 16221: follow-up for changes made by bug 16229
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 7f52638129bd48ab7f38dc809e7ece78773e8b91) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jacek Ablewicz [Thu, 7 Apr 2016 08:26:31 +0000 (10:26 +0200)]
Bug 16221: Use Storable::dclone() instead of Clone::clone() for L1 cache deep-copying mode
Storable dclone() is over 3x faster then Clone::clone() when used for
creating a deep copies of the big, complex data structures like MARC
frameworks. See also Bug 16044 comments #18 & #20.
This is a trivial version of Bug 16166. Performance test
results (see Bug 16140 comment #23 for test setup description):
Bug 16166 is a bit faster and more comprehensive implementation, but
also more complex and harder to test/evaluate.
Test plan:
1) apply patch
2) profile GetMarcStructure() calls before / after patch, e.g. by
running some script which calls it often (like catalogue search
w/ XSLT processing turned on, etc.)
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 0c6f23a6ce45183c6396925f6018ec31090ed2cb) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar> Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
(cherry picked from commit 40ec26dc6cbc2ac2634ca0e8111476bbd6f62fc7) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Fri, 8 Apr 2016 11:54:44 +0000 (12:54 +0100)]
Bug 16229: Add the unsafe flag to set_in_cache
Could be useful later.
Signed-off-by: Jacek Ablewicz <abl@biblos.pk.edu.pl> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar> Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
(cherry picked from commit 22c907230af9821d84127f9e2afbea9757aed2fa) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Fri, 8 Apr 2016 11:43:48 +0000 (12:43 +0100)]
Bug 16229: Deep copy on setting in cache
Koha::Cache->set_in_cache should deep copy (if needed) to avoid the
value which has been set in cache to be unintentionally modified later.
Signed-off-by: Jacek Ablewicz <abl@biblos.pk.edu.pl> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar> Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
(cherry picked from commit 33ad907a820debc87bf2629cc1eed4a38b3b4905) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Fri, 8 Apr 2016 12:08:55 +0000 (13:08 +0100)]
Bug 16229: Deep copy on first L2 fetch
When a value exists in L2 cache but not in L1 cache, it should be deep
copied if needed (i.e. not a scalar). Otherwise the calling code is able
to modify the value in cache.
Note that is theoretical, it's possible that no code does that.
Signed-off-by: Jacek Ablewicz <abl@biblos.pk.edu.pl> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar> Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
(cherry picked from commit 956dc953b52a1fd525bc75682bbdfe6848683ace) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Galen Charlton [Tue, 7 Jun 2016 01:42:59 +0000 (01:42 +0000)]
Bug 16675: fix breakage of t/Languages.t
This patch fixes test breakage introduced by the patch for bug 16088,
which added caching of getlanguages(). Upon inspection, it looks like
the patch for 16088 does not introduce a regression on bug 10560,
so this patch adds a couple cache-clearings.
To test
-------
[1] Verify that t/Languages.t passes.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b9b4eeb849dcb52053a98440e1d8fb02011a9005) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Mon, 9 May 2016 16:27:51 +0000 (17:27 +0100)]
Bug 16088: Introduce Koha::Cache::Memory::Lite to cache the language
The goal of this patch is to avoid unecessary flush of the L1 cache on
creating a new CGI object each time C4::Languages::getlanguage is called
without a CGI object.
The new class Koha::Cache::Memory::Lite must be flushed by the CGI
constructor overide done in the psgi file. This new class will ease
caching of specific stuffs used by running script.
Test plan:
At the OPAC and the intranet interfaces:
Open 2 different browser session to simulate several users
- Clear the cookies of the browsers
- User 1 (U1) an User 2 (U2) should be set to the default language
(depending on the browser settings)
- U1 chooses another language
- U2 refreshes and the language used must be the default one
- U2 chooses a third language
- U1 refreshes and must be still using the one he has choosen.
Try to use a language which is not defined:
Add &language=es-ES (if es-ES is not translated) to the url, you should
not see the Spanish interface.
Signed-off-by: Jacek Ablewicz <abl@biblos.pk.edu.pl> Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit f01a07a25e0503d9dbed3a4226cb51a155bcacd4) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Tue, 15 Mar 2016 16:40:14 +0000 (16:40 +0000)]
Bug 16044: Add an unsafe flag to Koha::Cache->get_from_cache
If the caller/developer knows what he is doing, he can decide not to
deep copy the structure. It will be faster but unsafe!
If the structure is modified, the cache will also be updated.
This option must be used with care and is not the default behavior.
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit b0bbace4dd8c19488110bf5c06817077abaa3f1c) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Tue, 15 Mar 2016 16:17:32 +0000 (16:17 +0000)]
Bug 16044: Add deep cloning
To avoid the cache to be modified unfortunately, the default behavior of
get_from_cache will be to deep copy if we are getting a structure.
If the item is a scalar, it's simply returned.
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 2e0af6e6df279aa08603e9696d35fc7def7bd7d3) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Tue, 15 Mar 2016 15:50:15 +0000 (15:50 +0000)]
Bug 16044: Add tests to make sure structures will be copied
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 3bfe541d0d97cdad08f9be2cff20c04a03424a25) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Tue, 15 Mar 2016 15:45:20 +0000 (15:45 +0000)]
Bug 16044: Make tests from t/Cache.t pass
The timeout does not impact the L1 cache (it would be to time consuming
and not really useful to do that for this cache).
To simulate the real timeout, we need to flush this L1 cache when
needed.
It would be also done adding a disable_L1_cache method.
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit bbfe394bb6e1ac8851b3c73826ea6fa5e7a0c94c) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Thu, 10 Mar 2016 15:54:28 +0000 (15:54 +0000)]
Bug 16044: Use the L1 cache for any objects set in cache
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit dda7a0a25ff480abda219084686e8138341fbba3) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Claire Gravely [Sat, 4 Jun 2016 11:30:30 +0000 (13:30 +0200)]
Bug 16165 - Include link to ILS-DI documentation page in ILS-DI system preference
There is no clue in the system preference about the nice ILS-DI documentation
once you turn it on. We should include a note and the link, similar to how we
do it for the web self checkout.
Test plan:
Syspreference ILS-DI should now include URL in description.
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 9066ae153b15ae49b7d5832b331eed31c32ed583) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 903d0432c3dfc84236d1ff40606444e3a56c845b) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Mark Tompsett [Sat, 4 Jun 2016 15:11:00 +0000 (11:11 -0400)]
Bug 16637: Dependency for C4::Tags not listed
Added optional dependency, so as to explain why testing
explodes when the Enhanced Content system preference
TagsExternalDictionary is set. It is optional, because not only
does TagsExternalDictionary have to be set, but TagsEnabled
must be 'Allow'.
Also tweaked C4/Tags.pm to ignore TagsExternalDictionary,
if Lingua::Ispell is not installed. A warning is given.
TEST PLAN
---------
1) Set the Enhanced Content system preference
TagsExternalDictionary to /usr/bin/ispell
2) sudo apt-get install liblingua-ispell-perl
-- should be a new install
3) prove t/db_dependent/Tags.t
-- should work fine
4) sudo apt-get remove liblingua-ispell-perl
5) prove t/db_dependent/Tags.t
-- should explode
6) Clear the Enhanced Content system preference
TagsExternalDictionary
7) prove t/db_dependent/Tags.t
-- should work fine
8) apply patch
9) prove t/db_dependent/Tags.t
-- should work fine
10) Set the Enhanced Content system preference
TagsExternalDictionary to /usr/bin/ispell
11) prove t/db_dependent/Tags.t
-- should work, with warning.
12) sudo apt-get install liblingua-ispell-perl
13) prove t/db_dependent/Tags.t
-- should work fine
14) run koha qa test tools.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Post-hackfest hotel Olympia lobby signoff. Kalimera!
Works as expected.
At this moment the Tags.t test does not need the database btw,
but the module should have much more test coverage.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c91b16bd9e82588c7625f69e37d6435dd378915e) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 358e7a6d61d49c3ad8b57e2ad952f3fd9e4b83de) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marcel de Rooy [Fri, 10 Jun 2016 08:31:34 +0000 (10:31 +0200)]
Bug 16636: [QA Follow-up] Move External_BakerTaylor.t to t
When we mock the preferences completely now, we do not need
db access anymore.
Test plan:
Run the test without exporting KOHA_CONF.
The test passes with some warns about koha-conf.xml.
If you point KOHA_CONF to etc/koha-conf.xml, you have no warns.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 7f4682df0dfa460c0e2ef9117e032165a45d6e79) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit af029c8655eb90e604286118ac6065851088bd57) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marcel de Rooy [Fri, 10 Jun 2016 07:30:51 +0000 (09:30 +0200)]
Bug 16636: [QA Follow-up] Make BakerTaylor plack safe
Initialize file level lexicals each call. Do not call _initialize
outside the module.
Adjust test by mocking preferences.
Test plan:
Run t/db_dependent/External_BakerTaylor.t.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested module with trivial script under Plack/memcached by toggling
the associated preferences.
Mark Tompsett [Thu, 2 Jun 2016 00:43:30 +0000 (20:43 -0400)]
Bug 16636: t/00-load.t warning from C4/External/BakerTaylor.pm
Since the tests are expecting an initialize function, the
initialize call was just moved outside of the INIT block.
TEST PLAN
---------
1) prove t/00-load.t
-- warnings about INIT for BakerTaylor
2) prove `git grep -l BakerTaylor | grep [.]t$`
-- should all run okay
3) apply patch
4) repeat steps 1 and 2
-- warning should be gone, and everything else run okay
5) run koha qa test tools
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Florent Mara <florent.mara@gmail.com>
NOTE: Tweaked test plan based on comment #4,
Added sign off based on comment #6.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b4479624de2010fff8851732e94d086b2cca6921) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 9c7c4f02ddad4045fde7ecf68c03389bb6f10436) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marcel de Rooy [Mon, 6 Jun 2016 08:49:06 +0000 (10:49 +0200)]
Bug 16635: [QA Follow-up] Eliminate some global package vars
[1] $branch is only related to line 123 as fallback.
[2] $width moved to a constant; sub width is not used.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested the corresponding plugin in item editor.
Test t/db_dependent/Barcodes.t and Barcodes_ValueBuilder.t still pass.
Mark Tompsett [Thu, 2 Jun 2016 00:41:27 +0000 (20:41 -0400)]
Bug 16635: t/00-load.t warning from C4/Barcodes/hbyymmincr.pm
According to http://perldoc.perl.org/vars.html, "our" should
be a reasonable substitute for the "use vars". By declaring as
"our", and removing the INIT, prove t/00-load will no longer
generate a warning about INIT for the C4/Barcodes/hbyymmincr.pm
module.
TEST PLAN
---------
1) prove t/00-load.t
-- warnings about INIT for hbyymmincr
2) prove `git grep -l hbyymmincr | grep [.]t$`
-- should all run okay
3) apply patch
4) repeat steps 1 and 2
-- warning should be gone, and everything else run okay
5) run koha qa test tools
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit fd152d9e95a2236a00f3cb0284bdd2aa7cca6da2) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 7fbfa01f78c79daf434a351d165d22382f13fd94) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marc Véron [Wed, 1 Jun 2016 20:28:51 +0000 (22:28 +0200)]
Bug 16634: Translatability: Fix issue in memberentrygen.tt
This patch fixes a small translatability issue in
koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
The sentence following sentence was splitted by HTML tags:
"Attribute value xxxxx is already in use by another patron record."
To test:
- Review code
- Apply patch
- In Admin, create a unique patron attribute type and try to give
two patrons the same value for this attribute type.
Signed-off-by: Rocio Dressler <rocio@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 45dce0ac795357f5111db8cd81473317613bdcc1) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit cedc2b736e14381cc6830c6cb4b650ba19bc7719) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marc Véron [Tue, 31 May 2016 08:17:13 +0000 (10:17 +0200)]
Bug 16620: Translatability: Fix problem with isolated word "please" in auth.tt
This patch fixes a translatability problem (syntax in different languages) with a tag-isolated word "please"
in koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
To test:
- Verify in code that there is no sentence spliting by a-tags (lines 80/84).
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b0ba45058ab0221838f7563f761d283c377b829d) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 7f3243daec25a462d4c9244b8b7b7c8dd6f2fd3f) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
phette23 [Fri, 27 May 2016 17:13:14 +0000 (10:13 -0700)]
Bug 16613: fix MARC 09X help links
The 09X MARC fields, such as 099 local call number or 090
locally-assigned Library of Congress call number, all point to
non-existent pages on the LC website, e.g.
http://www.loc.gov/marc/bibliographic/bd090.html
Test plan:
- enter the advanced cataloging editor
- begin to input any MARC tag of form 09X
- click the help link at the bottom of the browser window
=> Without this patch, taken to a URL of form `'http://www.loc.gov/marc/bibliographic/bd' +
tag + '.html'` which is broken because the only documentation for
these tags is at https://www.loc.gov/marc/bibliographic/bd09x.html
=> With this patch applied, the link is correct
Signed-off-by: Nicole C Engard <nengard@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit ec66ff457b6f1b682f7ad7d0e4f2df6656815848) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit fe295fce2dec9626498154658bb45cd46ea09cb4) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marc Véron [Wed, 1 Jun 2016 14:41:55 +0000 (16:41 +0200)]
Bug 16540 - Clean up opac-auth.tt for translatability
This patch fixes translatability issues in opac-auth.tt (ugly
translations caused by sentence splitting).
It was necessary to change indentation to make the the file more
readable and to make sure that changes have no side effects.
The changes do not touch the overall functionallity.
To test:
- Review code to verify that no functionality change is introduced
and to verify that the text changes make sense.
- Apply patch, verify that OPAC login page behaves as before.
UPDATE: Amended for comment #10 / mv Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 6b432d2b213101d2e8d0bf41fbc4a0e5b4ecb4e1) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 88c130eb43eacc8ce107509a6985a4d6eb4f0683) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Bug 16667: Unused variable and function call in circulation.pl
This patch removes an unused occurence of the $branches variable. Probably a
leftover from a recent rewrite.
To test:
- Run:
$ git grep '$branches' circ/circulation.pl
=> FAIL: Only on occurence of the variable
- Apply the patch
- Run:
$ git grep '$branches' circ/circulation.pl
=> SUCCESS: The variable has been removed
- Sign off :-D
Regards
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 2bff91eb4e733a5c658e17fb93f13497768ba2e6) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 9d8b407d7e0fc220268c4df3a0bebe4f508eae25) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Fridolin Somers [Fri, 27 May 2016 08:50:00 +0000 (10:50 +0200)]
Bug 16608 - Missing entity nbsp in some XML files
The special character "non breaking space" is not contained in XML
syntax by default. So we add it in the file header :
<!DOCTYPE stylesheet [<!ENTITY nbsp " " >]>
Even if the source code files do no contain this character, it can be that
translated files contain it. French for example "Titre :".
This entity is missing in all files in koha-tmpl/intranet-tmpl/prog/en/data/
and in some files of koha-tmpl/intranet-tmpl/prog/en/xslt.
Test plan :
- generate French templates:
cd misc/translator
./translate install fr-FR
cd ../..
- run test:
prove -v t/00-valid-xml.t
you get failing error message
- apply this patch
- translate again
- run test again: it passes
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works as described following test plan
Tes pass, no errors.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f38a9927a3d27709173564848bda4a4a61abeadb) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 0cc550dcc3d0c05b9688bb590a827671f5f8ee95) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marc Véron [Sat, 28 May 2016 07:44:40 +0000 (09:44 +0200)]
Bug 16589 - Quote of the day: Fix upload with csv files associated to LibreOffice Calc
To reproduce:
- Install LibreOffice and make sure that csv files are associated to Calc
(Note: tested with Firefox 46.0.1 on Windows 8)
- Go to Home > Tools > Quote editor > Quote uploader
- Try to upload a valid CSV (e.g. Example from Bug 15684)
Result: File can not be uploaded
(Incorrect filetype: application/vnd.sun.xml.calc)
To test:
- Apply patch
- Try to upload again
Expected result: Quotes are imported.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Can't reproduce on a Mac but get it fails on a Windows Box: fixed with this
patch.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Can't recreate on debian but the fix looks safe.
Owen Leonard [Thu, 26 May 2016 16:29:38 +0000 (12:29 -0400)]
Bug 15676 - Actions in pending offline circulation actions are not translatable
This patch modifies the offline circulation transaction processing page
so that English strings describing actions are processed in the template
rather than being output directly from the script.
To test, apply the patch and create an offline circulation file
containing at least one checkout, one check-in, and one payment.
- Upload the file and choose 'Add to offline circulation queue.'
- View pending offline circulation actions
- In the list of pending actions, the actions column should show "Check
out" instead of "issue," "Check in" instead of "return," and "Payment"
instead of "payment."
Strings appear as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e9d6ac9478606d9d123a22635719b99d985b9538) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit acc459fa1bae3b1abd13b826420bfb836a1250af) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Bug 14897 - Header name mismatch in ./modules/catalogue/detail.tt
We changed the detail.tt file for staff interface from Publication details to
"Serial enumeration / chronology" to match the cataloguing editor.
Signed-off-by: Joy Nelson <joy@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 43d77fdcf01906fa535482691e5eade47287ab2f) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 4b3b7bbd8d6b497e17ad862737c607bcc5fd09e4) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Bug 14605 - Corrects the individual fine's description
When paying a fine, the description is built out of the borrower's type and title, instead of the actual fine's description.
STEPS:
1) in the staff, go to a user with a fine to pay.
a) if none, go to a user and Fines>>"Create manual invoice" with a
distinctive description.
2) In Fines>>Pay fines, click the "Pay" button on the line of the fine.
3) This will take you a "Pay an individual fine" screen, where the description
will look like "Staff Mrs", for the category and title of the borrower.
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 63041c19c98b90c934ef89634dfdaf2d6abeb762) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 744b035932608a0ce3dd495765f9c249d1f527db) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Kyle M Hall [Tue, 10 May 2016 16:36:03 +0000 (16:36 +0000)]
Bug 16492 - Checkouts ( and possibly checkins and other actions ) will use the patron home branch as the logged in library
Bug 14507 introduced the use of checkpw in C4::SIP::ILS::Patron so that
non-Koha internal authentication processes would be able to function via
SIP ( LDAP et al ).
The problem is that checkpw changes the userenv to that of the patron!
This is not usually an issue in Koha because most of the time that
patron running through checkpw is the one to be logged in.
Aside from SIP2 the only other area where this may be an issue is in SCO
when using SelfCheckoutByLogin.
Test Plan:
1) On master, check out an item to a patron via SIP2
2) Note the checkout lists the item as having been checked out
from the patron's home library not matter which library is was
supposed to be checked out from.
3) Apply this patch
4) Re-checkout the item
5) The item should now be checked out as if it was checked out from
the library as defined in the SIP configuration file.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 90307bcbfaf4c2c8907be94eabca249ac173442e) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 57086a241e141e157d42b8af3f56ae9283d46ae9) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Wed, 8 Jun 2016 13:52:04 +0000 (14:52 +0100)]
Bug 16695: Require Exception::Class 1.38 instead of 1.39
Looking at
http://cpansearch.perl.org/src/DROLSKY/Exception-Class-1.40/Changes
there is no need to require 1.39
Signed-off-by: Jacek Ablewicz <abl@biblos.pk.edu.pl> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a4c44b9f643ab9a31c4025f6001a823fdcbb8101) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 700fbd0a35073dc3cef7b3e340ab806a21354ba1) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Tue, 7 Jun 2016 11:29:33 +0000 (12:29 +0100)]
Bug 16668: Fix t/Ris.t tests
Caused by bug 16442.
Now we need to mock the marcflavour pref
Test plan:
prove t/Ris.t
should return green
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 023384811f54f18fbe585431c49b80cfc20e58dd) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a1f1ea03177204af1cb5dde29b5f18f339402bdb) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Tue, 5 Apr 2016 06:52:50 +0000 (07:52 +0100)]
Bug 16199: Remove C4::Ris::charconv
This subroutine always returns what has been sent in parameter.
It is unecessary and can be removed.
Test plan:
prove t/Ris.t
should not be noisy
Export a catalogue record in Ris should generate the same file with and
without this patch
NOTE: With/Without were identical in my testing.
t/Ris.t is nicely silenced.
Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 88dc70f7e691da61742f79c46c601de82a1d7e56) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Wed, 25 May 2016 17:09:27 +0000 (18:09 +0100)]
Bug 16578: Same fix for the staff interface
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works as first patch
No errors
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3948102f2ad6e5382a31a00df0c8f52def3daf58) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 43002c3b0e1659edc910cae435c3715a46e80a76) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Bug 16578: Fix wide character errors in opac-export.pl
This simple patch fixes wide character warning raised by opac-export.pl when
'MARC (Unicode/UTF-8)' and 'MARC (Unicode/UTF-8, Standard)' formats are chosen
for downloading records.
To test:
- Have records indexed
- Open your OPAC logs:
$ tail -f /var/log/koha/kohadev/opac-error.log
- Open the detail page in the opac for a record
- Choose Save record > MARC (Unicode/UTF-8)
=> FAIL: opac-export.pl: Wide character in print at /home/vagrant/kohaclone/opac/opac-export.pl line 116., referer: http://localh...
- Choose Save record > MARC (Unicode/UTF-8, Standard)
=> FAILE opac-export.pl: Wide character in print...
- Apply the patch
- Choose Save record > MARC (Unicode/UTF-8)
=> SUCCESS: No warnings raised.
- Choose Save record > MARC (Unicode/UTF-8, Standard)
=> SUCCESS: No warnings raised.
- Sign off :-D
Followed test plan, works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 7d4844e171b1319b90e7bd73510bd97c2acbf635) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 164ffdb43c98b4d2fa193d80c48f5509294fa1ca) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Wed, 11 May 2016 12:04:38 +0000 (13:04 +0100)]
Bug 16465: Fix typo issues vs checkouts
Test plan:
Confirm the wording is correct
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit af59b669413539606f10652230e5f96d43337cb5) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit c5fc0fcd0e28309114c70333cb75a2aee11b35e0) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Wed, 11 May 2016 11:57:47 +0000 (12:57 +0100)]
Bug 16465: discharge - Add a title tag at the OPAC
Test plan:
Confirm that the opac-discharge.pl has now a title
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 27254de06d8ae6682b395be48d6ba02b69f9e917) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 5ce7baf937d8e7ddf56ca0ae4dde00690fe5a32c) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marcel de Rooy [Wed, 11 May 2016 13:47:46 +0000 (15:47 +0200)]
Bug 16428: [QA Follow-up] Useless call to GetMarcStructure in _build_default_values_for_mod_marc
The routine calls GetMarcStructure and does not use its return value
after all.
Test plan:
Run t/db_dependent/Items.t
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 6a706b86a273672b1e1ca3f1456fde08dd7a0da2) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit b31ee2eaf9dd86171cac1598f3f9a611ea145f83) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Tue, 3 May 2016 10:03:52 +0000 (11:03 +0100)]
Bug 16428: Use the biblio framework to know if a field is mapped
The subroutine _build_default_values_for_mod_marc takes the
frameworkcode in parameter, but ModItemFromMarc did not pass it.
It uses it to know if a field is mapped or not to a Koha field
(C4::Koha::IsKohaFieldLinked).
Consequently the default framework ("") was always used.
This bug has been found working on bug 13074 and has been put on a
separate bug report to ease the backport.
Test plan:
Without this change, the tests added by bug 16428 won't pass
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 52b1b8eae1136af1e901560214a641494acaf577) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 4ebfb709f6cdeb263b579f7a3538c1a1342a939a) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Tue, 7 Jun 2016 10:48:46 +0000 (11:48 +0100)]
Bug 16441: Fix Letters.t
These tests were wrong, but the package variable used to cache the
letters hid the problem.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 687a7e22b6c630c3bbc06e1845854514f6fea5b0) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a44040d07d24707d2cda51d989ad0fa495116608) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Wed, 4 May 2016 18:43:43 +0000 (19:43 +0100)]
Bug 16441: Do not use a package variable to cache C4::Letters::getletter
C4::Letters::getletter use a package variable (%letter) to cache letter
returned by the subroutine.
I have not found any direct issues caused by that but it is safer to
remove it.
It won't be a big deal to hit the DBMS to get a valid letter when
needed.
No test plan here, just confirm that the changes make sense.
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Confirm that performance loss is just a millisecond or so per
subsequent call of getletter.
Marcel de Rooy [Fri, 10 Jun 2016 09:49:45 +0000 (11:49 +0200)]
Bug 16443: [QA Follow-up] Add two tests for get_fields
Adds t/db_dependent/Members/Statistics.t.
Test plan:
Run the test.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 30cf9ee277481b54ed75e500c38f328f2d82b831) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 03d51281b079c379a2fba0caf8a9df8ec9c6d500) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Wed, 4 May 2016 19:08:53 +0000 (20:08 +0100)]
Bug 16443: Make C4::Members::Statistics plack safe
If the prefs is updated, the fields won't be.
To make sure we already fetch updated values, we should remove the
package variable and define it in the subroutine.
There is not test plan, just make sure the changes are consistent.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 29e402d398f567e2526c89695384bce7f4e4b737) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 93ffd58fe32dd4e27056f5cebf18b975f3d0624b) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Thu, 5 May 2016 15:58:06 +0000 (16:58 +0100)]
Bug 16455: Remove the "Too late to run INIT block" from C4::Tags
The pref TagsExternalDictionary is used to tell Lingua::Ispell to use an
other dictionary, different from the default one (/usr/bin/ispell).
To do so we need to set $Lingua::Ispell::path to the expected path.
It's currently done in the INIT block.
If you try to use C4::Tags, you will get the famous "Too late to run
INIT block at C4/Tags.pm line 74." warning. Plack use the INIT block to
load functions at run time, when we are using C4::Tags when hitting a pl
script, the compilation phase is finished and it's "too late to run INIT
block" from C4::Tags.
I do not really know if it has an impact on the behavior of
Lingua::Ispell (i.e. is the path redefined?), but I know that this INIT
block is not executed when we want.
Test plan:
under Plack,
- hit /cgi-bin/koha/opac-search.pl and confirm that the warning does no
longer appears
- Use another dictionnary (??), fill TagsExternalDictionary with its
path and confirm that it is used by the tags approval system
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 7d916c380a03904c47035f189d1ee666f00d9a11) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 6ff159e214a2ebf904ff7f1b77f0f75162f8afe8) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Tue, 17 May 2016 13:38:04 +0000 (14:38 +0100)]
Bug 16508: Updating a syspref requires parameters_remaining_permissions
And not all of parameters flags.
Test plan:
1/ Create a staff user.
2/ Go to details, select more->set permissions.
3/ Set catalogue, Manage Koha system settings (Administration panel),
manage circulation rules, and Remaining system parameters permissions.
4/ Log in as the new staff user, go to administration > system
preferences. Change a syspref and save it... it will save correctly.
5/ Log back in as superlibrarian
6/ On the 'set permissions' screen, un-check 'manage circulation rules'
and save.
7/ Log back in to the new staff user, and try to change the same
systemprefrence and save.
Followed test plan, works as expected. Signed-off-by: Marc Veron <veron@veron.ch> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit f2fe433cf9afce98957826bf2ade457557fe4eff) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 259fe9947b73023a22aceda2b7f7ad357500884f) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Fri, 13 May 2016 19:46:42 +0000 (20:46 +0100)]
Bug 16518: Fix Plack variable scoping problem in opac-addbybiblionumber.pl
The script opac/opac-addbybiblionumber.pl is not plack safe because the
variable @biblios is declared with our and is not assigned to an empty
array (so not reset).
The issue:
When trying to add items to a list (virtualshelf), the biblionumbers are
added to the @biblios variable and the list is not reset between each
run.
Test plan:
Check from records from the result list and add them
to a list.
Cancel or save and re-add them (or others) to a list (same or
different).
=> Without this patch, the list of records will never stop growing, the
previous items added are still listed when adding new ones.
=> With this patch, the behavior is the one expected.
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit ab1beed06f249d1e7d0be5bb1b584e62f5b48783) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 2729f038c34b5c4f0b713738c9bf4a94068f1b43) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Aliki Pavlidou [Sat, 4 Jun 2016 12:10:38 +0000 (12:10 +0000)]
Bug 15641 - Typo in explanation for MembershipExpiryDaysNotice
There's an extra period after the word "in" in the MembershipExpiryDaysNotice
sys "Send an account expiration notice when a patron's card will expire in.
[value box
Bug fixed!
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 6b7f4a3a9ec18b550d011a7eee9e7108b7042059) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit e242625721b0dcd68cd7b3408ef9da5d367a878d) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Rocio Dressler [Sat, 4 Jun 2016 09:24:45 +0000 (02:24 -0700)]
Bug 16537 - Overdue and Status triggers grammar
Test plan:
1) Go to the staff client
2) Click on Tools - Overdue notice/status triggers
3) Confirm that the first sentence reads "a" checkout rather than "an" checkout
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit a589879f495aeb25200119cb4f1bf76c28dce660) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 020d755ed061cfc94ca12eace6fae7388cc89e3e) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Wed, 11 May 2016 11:00:01 +0000 (12:00 +0100)]
Bug 16458: Update library when a guarantor is set
If you edit a patron from the Edit link of the patron information block
(step 1 of the memberentry script), the branchcode is not displayed. If
you set a guarantor to a child from this form, a JavaScript error will
be raised:
JavaScript error form.branchcode is undefined
It happens because there is the branchcode is not displayed and there is
no element with a branchcode name.
To avoid this issue, a branchcode hidden input is added to the form and
it will be updated when a guarantor is selected (same behavior as when
you edit a patron using the complete form).
Test plan:
Edit a patron using the Edit link of the patron info block (not the Edit
button in the toolbar)
Set a guarantor
=> Notice that the branchcode of the patron has been updated with the
branchcode of the guarantor
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit fc35a5099f613c08d12be1d67fd027d4a5eaf99c) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit b7a0322258ad534ea8e5af34cb0581b0b5f174e8) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Wed, 4 May 2016 18:53:46 +0000 (19:53 +0100)]
Bug 16442: Make C4::Ris plack safe
C4::Ris incorrectly uses 4 package variables:
- $utf: not used, can be removed
- $intype: set to marcflavour once, but later it assumes that it is
usmarc if not defined
- $marcprint: always 0, so set it to 0
- $protoyear: only used in 1 subroutine, let's define it at this
level
Test plan:
Just make sure the RIS export works as before this patch
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 87b181c6d40e7a811fee511648ddd3cb7d44c4e4) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a987ff3ba92e1558e11a63335895749b5efd1689) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Claire Gravely [Fri, 3 Jun 2016 08:38:25 +0000 (10:38 +0200)]
Bug 16642 - Fix capitalisation for upload patron image
To fix capitalisation on the staff interface when patronimages is turned on.
Test plan:
1. In staff interface. Turn on patronimages sys preference.
2. Go to a patron without an image and check that the "Upload
patron image" box heading now has correct capitalisation.
3. Go to a patron with an image already uploaded and check the
"Manage patron image" box heading has correct capitalisation.
Signed-off-by: Sofia <szapoun@lib.auth.gr> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 78b2fde34831a4840f6b89df054a5307f1ead54b) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 9a2c6bfde243f0fe41112fe1b651273ab091c901) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Mon, 23 May 2016 11:19:46 +0000 (12:19 +0100)]
Bug 16565: Drop additional_fields and additional_field_values before creating them
These 2 tables should be dropped before trying to create them
Test plan:
From the SQL CLI, source the kohastructure.sql file
source it again
=> Without this patch you get 2 warnings
ERROR 1050 (42S01) at line 3580 in file:
'installer/data/mysql/kohastructure.sql': Table
'additional_fields' already exi
sts
ERROR 1050 (42S01) at line 3596 in file:
'installer/data/mysql/kohastructure.sql': Table
'additional_field_values' alrea
dy exists
=> With this patch, you won't get them
Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit a01cd77e19f810bf61c8d26ebb97f7c49f1d1f32) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit b49adab4a1c4bb08714371223572caf35460f0f4) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Kyle M Hall [Fri, 27 May 2016 12:42:17 +0000 (12:42 +0000)]
Bug 16610 - Regression in SIP2 user password handling
Previous to bug 14507, SIP2 only did internal authentication. A change
to the way we check empty passwords has caused any empty password to
send back a CQ of Y. Previous to that patch set, a CQ of Y would only be
sent back of the patron password column was NULL. Now, an empty AD field
*always* returns a CQ of Y.
Test Plan:
1) Send a patron information request with an empty AD field
Note: You must send the AD field or you won't get back a CQ field
2) Note you get back a CQ of Y
3) Apply this patch
4) Repeat step 1
5) Note you now get back a CQ of N
Signed-off-by: Trent Roby <troby@bclib.info> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 71f0370ddde0d8b8e2a666a091081186fb6531e8) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 66c9ef12c16efeebf78e3a98be7b2ccc42d14e7a) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Fri, 13 May 2016 13:43:52 +0000 (14:43 +0100)]
Bug 16504: (follow-up for bug 15163) Do not remove attributes of other patrons
Simple patch for a silly error, this single line is going to fix a
critical bug.
If a patron attribute is limited to a library, all the values for that attributes
for every patrons will be deleted.
Test plan:
Create a patron attribute limited to a library
Set the the attribute for a patron
Set the the attribute for another patron
=> Without this patch applied, the attribute's value for the first
patron is deleted
=> With this patch applied, the 2 values exist in the DB after the
second edition
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit da94410ab5022c3bd97fba1878673149802db584) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 247bd55876a4e930934419070fc926a656a0d9d7) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Aleisha [Fri, 13 May 2016 00:46:40 +0000 (00:46 +0000)]
Bug 16511: Making contracts actions buttons
To test:
1) Go to Acqui -> find a vendor
2) On Vendor details page (supplier.pl) confirm that Contracts table now
has one column called Actions
3) Confirm that Edit and Delete show as buttons
4) Confirm that buttons don't wrap on a narrower browser
5) Click Contracts tab
6) Confirm Actions column, Edit and Delete buttons, and button's don't
wrap
Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 23c8dc0e6384779c0eaf8441d598b60ac6aea46e) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 92c08a6a4e177622a4513fa34c81dfcbec20ec57) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Aleisha [Mon, 16 May 2016 01:10:43 +0000 (01:10 +0000)]
Bug 16525: Have cancel button when adding new aq budget
At the moment you only see the cancel button on the form if editing an
existing budget. This patch adds a cancel button to the form which adds
a budget. Also changes the wording of the save button from 'Save
changes' to just 'Save' so it makes more sense when adding a new budget
To test:
1) Go to Admin -> Budgets -> New budget
2) Notice 'Save changes' button and no cancel
3) Apply patch and refresh page
4) Notice 'Save' button and 'cancel' link
5) Click 'cancel' - should be taken to Budgets administration page
6) Edit an existing budget
7) Click 'cancel' - should be taken to the funds page for that budget
Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Sabine Liebmann <Liebmann@dipf.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Still an issue: If edit a budget fron aqbudgets.pl, then cancel, you get
aqbudgets.pl?budget_period_id=XX. But existed before this patch.
Lari Taskula [Tue, 17 May 2016 11:44:45 +0000 (14:44 +0300)]
Bug 16200: Convert all existing expired holds accounttype to HE
Before Bug 16200 expired holds have used accounttype F which is also used by
other type of fines. This patch updates all existing expired holds to new
accounttype HE (Hold Expired).
To test:
-1. Make sure you translated the string in previous patch of this buug
1. Find a Patron with "Hold waiting too long" fines and go to his Fines tab
2. Change Koha's language to some other than English
3. Observe that "Hold waiting too long" is still in English
4. Apply patch and run database update
5. Go back to Patron's Fines tab
6. Observe that "Hold waiting too long" is now translated
Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti@jns.fi> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 09de19c427c1e99d7e921210ed39cb6a19737317) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit d80368370258432aab4d4171b886af26442d08c1) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Lari Taskula [Tue, 17 May 2016 11:33:57 +0000 (14:33 +0300)]
Bug 16200: Make 'Hold waiting too long' translatable and give it an unique accounttype
Holds that have expired have been untranslatable in Patron's Fines-tab. Also, they are
mixed with other type of fines with accounttype "F". This patch gives expired holds an
own accounttype "HE" (Hold Expired) and modifies the boraccount to recognize this new
accounttype in order to make it translatable.
To test:
1. Make a hold and let it expire
2. Go to Patron's Fines tab
3. Change Koha's language to some other than English
4. Observe that there is a "Hold waiting too long" fine described in English
5. Apply patch
6. Make another hold and let it expire
7. Update translations
8. Find "Hold waiting too long" from your .po file
9. Translate it and install translations
10. Go back to Fines tab and observe that the new expired hold is translated
Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti@jns.fi> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 7163fcfeea382e1e042a47a76d384155e8c69bc0) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 326616d2bce77b245e0d38eb3df659e821130645) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Owen Leonard [Wed, 18 May 2016 23:45:27 +0000 (19:45 -0400)]
Bug 16548 - All libraries selected on Tools -> Export Data screen
This patch adds "select all" and "select none" links to the display of
libraries in the export bibliographic records form.
Also modified: call number range and accession date fields have been
grouped in their own fieldsets in the hopes that this is more readable.
Page title and breadcrumbs have been corrected to read "Export data"
instead of "MARC export," matching menu items.
To test, apply the patch and go to Tools -> Export data.
- Test the select all/select none links and confirm that they work as
expected.
- Confirm that the structural changes to the form look okay.
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Post sign-off revision: Use the standard "Clear all" instead of "Select
none."
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 06b9194cdd178f14347b8f9090657dbf5b712450) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a85be57e1ce1d2adde6b9ee3dba55f7c5f2e06ab) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Kyle M Hall [Mon, 23 May 2016 14:28:10 +0000 (14:28 +0000)]
Bug 16569 - Message box for "too many checked out" is empty if AllowTooManyOverride is not enabled
If the limit for number of items checked out is reached, the message box
shows up but is empty.
Test Plan:
1) Disable AllowTooManyOverride
2) Check out items to a patron until the patron has reached the limit
of checkouts he or she can have
3) Try to check out one more item
4) Note the empty message box
5) Apply this patch
6) Try to check out one more item again
7) Note the message is now visible
Signed-off-by: Nicolas Legrand <nicolas.legrand@bulac.fr> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit af43f91335b2258ea39b40247a1492ca41dafe2a) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a47180eb3bc0ca26a018f68ffcc4d5635f6f7789) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
projects / koha.git / log