Commit Graph

20201 Commits

Author SHA1 Message Date
Nicole C. Engard 5f30de46e8 Bug 11383: Add help file for MARC modification templates
This patch adds the missing help files to the MARC modification
templates tool. To test:

* Visit Tools > Marc modification templates
* Click 'Help' in the top right
* Confirm that help is there and right

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 94690b264b)
2013-12-30 10:55:29 +01:00
Fridolyn SOMERS 64c79561bb Bug 11166: make library filter in funds administration page more precise
In funds administration, admin/aqbudgets.pl, there is a combobox for
filtering by library code.

The bug is that the filter uses a pattern match  instead of equals :
  next unless $budget->{budget_branchcode} =~ m/$filter_budgetbranch/;

In this case, if there is a library with code '1' and one with code '12',
filtering by library '1' will also show funds of library '12'.

Test plan :
- Create a library with code '1' and one with code '12'
- Create funds in both libraries
- Go to admin/aqbudgets.pl
- Filter by branch '12'
=> You see only funds of this library
- Filter by branch '1'
=> You see only funds of this library

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passes koha-qa.pl, works as advertised

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 484d149092)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-30 10:53:01 +01:00
Galen Charlton 038405724a Bug 10626: (follow-up) replace use of KohaAuthorisedValues in the Bootstrap theme
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit e334aed702)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>

Conflicts:
	koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
2013-12-30 10:48:52 +01:00
Katrin Fischer 8227019605 Bug 10626: (follow-up) remove final invocation of KohaAuthorisedValues
Removes USE KohaAuthorisedValues plugin from
item-status-schema-org.inc as it does not seem to be used
in the file.

Couldn't detect regressions removing it on OPAC detail page.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 0c19c58218)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-30 10:39:09 +01:00
Kyle M Hall 9d3795cce5 Bug 10626: (follow-up) replace an instance of KohaAuthorisedValues
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Trying to write my own test plan here:

1) AllowNotForLoanOverride = Allow
   Mark single item not for loan and try to check it out.
   Check item not for loan status shows up correctly in message:
   Item is normally not for loan (Staff Collection). Check out anyway?

2) Toggle AllowNotForLoanOverride = Not Allow
   Try to check out your not for loan item again.
   Message has changed, but not for loan status should still show:
   Item not for loan (Staff Collection).

3) Check out item that is marked damaged.
   Check damaged status shows correctly in list of checkouts.

4) Mark item as lost and check it out.
   Check lost status shows up correctly in message:
   This item has been lost with a status of "Lange überfällig (Verloren)".

5) Create your own custom SUGGEST_STATUS and check that it shows
   up correctly on the suggestion page.

6) Test item status show up correctly on OPAC detail page (lost, not
   for loan, damaged, etc). Requires follow-up patch to be applied.

7) Mark a suggestion with your custom status and make sure it shows
   up in the patron account in OPAC correctly.

Passes tests and QA script - needs a follow up for item-status-schema-org.inc.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 0958ec11ce)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-30 10:39:01 +01:00
Kyle M Hall d4b7d7b934 Bug 10626: Remove doubled up TT plugins - Merge KohaAuthorisedValues and AuthorisedValues
This patch removes the KohaAuthorisedValues TT plugin; uses of it are
replaced by the AuthorisedValues plugin, which does the same thing.

Test Plan:
1) Apply this patch
2) View the pages that this patch has modified, make sure the branch
   name is still visible

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comments on second patch.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit b5b3d4c403)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-30 10:38:49 +01:00
Kyle M Hall 5325b33740 Bug 10626: (follow-up) replace another use of KohaBranchName
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
Make sure
- independentbranches is turned on
- Your user doesn't have superlibrarian permission
Then
- Try to check out an item with home and holding branch !=
  logged in branch

Patch works alright.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 4a7bb58b1d)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-30 10:38:39 +01:00
Kyle M Hall 22b0cc7b18 Bug 10626 - Remove doubled up TT plugins - Merge KohaBranchName and Branches
Looking at the TT plugin directory I notice we have some plugins that
seem to do the same thing:

KohaBranchName.pm
Branches.pm

This patch drops KohaBranchName in favor of Branches

Test Plan:
1) Apply this patch
2) View a basket group, note the branch name is displayed
3) View a subscription's details, note the branch name is displayed
4) View suggestions, note the branch names are displayed
5) Return an item that needs transfered, note the branch name is displayed
6) Run 'prove t/db_dependent/Koha_template_plugin_Branches.t'

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Also tested with a branch name with umlauts.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 6000bfdf87)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-30 10:38:24 +01:00
Galen Charlton 49d314fb92 Bug 10852: (follow-up) update the POD for C4::Serials::SearchSubscriptions
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 945dbfc490)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-30 10:32:37 +01:00
Galen Charlton 8d74b32e09 Bug 10852: (follow-up) regression tests
This patch adds regression tests for the changes to
C4::Serials::SearchSubscriptions().

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 659ac6a904)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-30 10:32:29 +01:00
Galen Charlton a03ca3fc5a Bug 10852: (follow-up) fix POD for C4::Serials::NewSubscription
The error in the POD was discovered in the course of writing
test cases for the main patch.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 8a5ce95916)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-30 10:32:12 +01:00
Galen Charlton f5f8e98945 Bug 10852: (follow-up) tweak wording of serials search form
* "Callnumber" => "Call number"
* "Expire before" => "Expires before"

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit c88d7d8318)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-30 10:32:04 +01:00
Kyle M Hall d1f81ee1d6 Bug 10852: (follow-up) switch from KohaAuthorisedValues to AuthorisedValues
Bug 10626 will remove the KohaAuthorisedValues plugin and keep the
AuthorisedValues plugin.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 28e4a4a699)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-30 10:31:57 +01:00
Jonathan Druart 1a8e76a8f2 Bug 10852: (follow-up) rename the "expiration date" filter name
Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit d20489c874)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-30 10:31:45 +01:00
Jonathan Druart 022b2c5cd7 Bug 10852: serials search improvements
This patch adds 3 filters for the serials search:
- location
- callnumber
- expiration date

To test:
- Search serials by location and/or callnumber and/or expiration date
  and check that results are consistent.

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 4651bbff21)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-30 10:31:33 +01:00
Fridolin SOMERS 09e79c62c8 Revert "Bug 8230: Display acquisition details on the catalogue detail page"
This reverts commit 72aad868b2.
2013-12-30 09:49:01 +01:00
Fridolin SOMERS 71c34b49d8 Revert "Bug 8230: (follow-up) reflect the fact that order statuses are now alphabetic codes"
This reverts commit a2a87e04e2.
2013-12-30 09:48:52 +01:00
Fridolin SOMERS b4fac44650 Revert "Bug 8230: DBrev 3.14.01.002"
This reverts commit 7870c0d8fe.
2013-12-30 09:48:42 +01:00
Fridolin SOMERS ca519daac4 Revert "Bug 8230: (follow-up) don't link to basket unless user has appropriate permissions"
This reverts commit ca75ea2959.
2013-12-30 09:48:33 +01:00
Fridolin SOMERS b25487e60d Revert "Bug 8230: (follow-up) fix detection of cancelled orders"
This reverts commit 0929a7e2b6.
2013-12-30 09:48:21 +01:00
Fridolin SOMERS e43ac28c99 Revert "Bug 8230: (follow-up) repair regression on order search"
This reverts commit 896a62b43b.
2013-12-30 09:48:11 +01:00
Fridolin SOMERS 26569175aa Revert "Bug 8230: (follow-up) update POD for C4::Acquisition::GetHistory"
This reverts commit 303cad8f1f.
2013-12-30 09:47:58 +01:00
Jonathan Druart 7b77c8a5ff Bug 11414: warn user about dangerous MARC modification rules
Test plan:
On the MARC modification tool:

Add/edit a new action on a field and define a condition on the same
field.

Verify that you get a warning message in red.

See bug 11413 for more information

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Tested adding and editing a template with the same field in the
action and the condition.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 7137ee91e0)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 14:37:53 +01:00
Galen Charlton 303cad8f1f Bug 8230: (follow-up) update POD for C4::Acquisition::GetHistory
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit bfc0a2cb81)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 14:27:58 +01:00
Galen Charlton 896a62b43b Bug 8230: (follow-up) repair regression on order search
This patch repairs a regression introduced by the main
patch where it became impossible to search for cancelled
orders from the advanced order search form.

This patch also tweaks the wording on the order status
drop-down on the order search form to clarify that the
default status filter is orders that have any status
except cancelled.

To test:

[1] Before applying this patch, perform an advanced
    order search (acqui/histsearch.pl) for orders
    with status cancelled.  Observe that no hits are returned.
[2] Apply the patch and run the search again.  This time,
    the cancelled orders should be returned.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 44eb833889)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 14:27:51 +01:00
Galen Charlton 0929a7e2b6 Bug 8230: (follow-up) fix detection of cancelled orders
This patch fixes a problem where the quantity / items column
in the acquisitions detail table would display ilnks to
items for cancelled orders.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit da3e33bff3)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 14:27:43 +01:00
Galen Charlton ca75ea2959 Bug 8230: (follow-up) don't link to basket unless user has appropriate permissions
With this patch, the basket number on the bib details page is linked
to the basket management page only if the staff user has the appropriate
permissions.

To test:

[1] Log in as a user with the acquisition/order_manage permission.
    Bring up a bib record that is attached to an order and verify
    that the basket number is an active link.
[2] Log in as a user that doesn't have the acquisition/order_manage
    permission.  Verify that the basket number displayed on the bib
    details page is not a hyperlink.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit a050ca83b7)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 14:27:34 +01:00
Fridolin SOMERS 7870c0d8fe Bug 8230: DBrev 3.14.01.002
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 14:27:15 +01:00
Jonathan Druart a2a87e04e2 Bug 8230: (follow-up) reflect the fact that order statuses are now alphabetic codes
Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passes koha-qa.pl, works as advertised. No regressions found.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit ba3bb0a4f8)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 14:25:35 +01:00
Jonathan Druart 72aad868b2 Bug 8230: Display acquisition details on the catalogue detail page
This patch adds a new tab "Acquitition details" on the catalogue detail
page. It provides a list of order made for this biblio.

New system preference:

AcquisitionDetails: Hide/Show the new tab.  The default for
new and upgraded installations is to display the new tab.

Test plan:
1/ Apply the patch.
2/ Select the "placing an order" value for the AcqCreateItem pref.
3/ Create a new order with X items.
4/ Go on the catalogue detail page for the selected biblio.
5/ Click on the "Acquisition details" tab and check that your order is
displayed. Itemnumbers are present in the last column. Check that links
are not broken.
6/ Close your basket.
7/ Status become "Ordered"
8/ Receive X-1 items.
9/ Come back on the catalogue detail page. There are 2 orders: 1
complete and 1 partial. The complete one has a receive date.
10/ Receive the last item.
11/ Now you have 2 orders with a complete status.
12/ Cancel the last receipt.
13/ You have 1 ordered and 1 complete (2 items).
14/ Cancel the first receipt.
15/ You have 1 ordered (3 items).
16/ Delete your order
17/ You have 1 deleted order.
18/ Switch the AcqCreateItem pref to "receiving an order"
19/ Do again steps 3 to 17.

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 7180eb1153)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>

Conflicts:
	installer/data/mysql/updatedatabase.pl
2013-12-24 14:25:00 +01:00
Marcel de Rooy ff284780e2 Bug 11124: QA Follow-up adding optional dependency HTTPD::Bench::ApacheBench
This dependency is used in load testing (misc/load_testing/*)

Test plan:
Check if you see the dependency listed on About/Perl modules.
Verify if the version information is correct.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit f90cca4831)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 14:04:56 +01:00
Marcel de Rooy 484b80d028 Bug 11124: QA Follow-up resolving a warning and three typos
Resolves warning on uninitialized author in split on line 128.
Just adds the same behavior for title on line 129 for completeness.
Fixes typo on occurrences and two other minor typos.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 1219b3153e)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 14:04:49 +01:00
Jonathan Druart 3335b258d4 Bug 11124: disallow trying to run the staff benchmark script as the DB account
On step 6 (at least), the circulation and return page redirect to the
select branch page and nothing is done.

The script should die if the user used is the sql administrator account.

Test plan:
Suppose that the sql admin account is root/root and koha/koha a
superlibrarian account.

1/
perl misc/load_testing/benchmark_staff.pl --steps=6
--url=http://admin.koha.local/cgi-bin/koha/
--password="koha" --user="koha"
should produce:
  ...
  Step 6
  ...

2/
perl misc/load_testing/benchmark_staff.pl --steps=1
--url=http://admin.koha.local/cgi-bin/koha/
--password="root" --user="root"
should produce:
Authentication successful
You cannot use the database administrator account to launch this script

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 4604f595d6)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 14:04:41 +01:00
Jonathan Druart 96599cc238 Bug 11255: allow "relevance ascending" as a sort option
This patch fixes a problem where if a staff member sets the
*defaultSortField/*defaultSortOrder system preferences to relevance
ascending while QueryParser is enabled, default keyword search
would break -- the query parser config did not declare relevance asc
as a possible "modifier".

Note that setting the sort order to relevance ascending does not
actually make catalog search return results with the least relevant
records showing up first; Zebra does not support such a mode.  In other
words, relevance ascending acts exactly the same as relevance descending.

Test plan:

0/ Create some biblio with "history" in the title and
   ensure that the QueryParser system preference is enabled.
1/ Define prefs defaultSortField = relevance and defaultSortOrder = asc
2/ Search "history" on the staff interface
3/ Note that no result is returned.
4/ Apply the patch
5/ Verify the queryparser config file in use takes the modification into
account (see the queryparser_config value in your $KOHA_CONF file).
6/ Relaunch the search and verify results are returned

Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 54937c5eb3)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 14:00:18 +01:00
Jonathan Druart e94fe58fa9 Bug 11261: make sample serial frequencies mandatory during installation
Test plan:
Verify all sample_frequencies.* files have been moved from optional
to mandatory directories.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 97b270aa2e)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 13:57:58 +01:00
Jonathan Druart b5e2d6f462 Bug 11261: make sample serial numbering patterns mandatory during installation
Test plan:
Verify all sample_numberpatterns.* files have been moved from optional
to mandatory directories.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All sample files for numbering patterns are moved from optional
to mandatory.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 3c2e45a058)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 13:57:40 +01:00
Jacek Ablewicz 2a38ac7259 Bug 9224: Make acqui/finishreceive.pl Plack-compatible
Under Plack/mod_perl wrapping, sub update_item() will become a closure,
so after the 1st run it will retain its own private instances of the
following variables: $booksellerid, $datereceived, $unitprice, $rrp,
$biblionumber.

I.e., in case update_item() gets invoked 2nd+ time (inside
the same process, but for different-subsequent receives) it may
incorrectly flag the (old, wrong) biblionumber for Zebra reindexing,
and erronously modify the current item[s] with the previously
used (wrong) values.

This simple patch should make acqui/finishreceive.pl Plack-compatible.

Test plan:
Test patched acqui/finishreceive.pl script (create and receive some
orders w/ items, etc.). Ensure items are gettting added and/or modified
correctly during receiving process.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passes koha-qa.pl, works as advertised, no regressions found.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 6dcc34c1b4)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 13:55:47 +01:00
Jonathan Druart 9478f2875a Bug 8334: (follow-up) remove commented JS code
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 4927140966)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 12:58:10 +01:00
Vitor FERNANDES fd865d5013 Bug 8334 - Authority UNIMARC 100 field plugin
This patch adds a plugin for field 100 of UNIMARC
authorities.

To test on a UNIMARC site:
1) Apply the patch
2) Edit some authority framework, field 100
3) Link subfield 'a' to unimarc_field_100_authorities.pl
plugin, save
4) Edit or add auth record, click on '...' to bring plugin
5) Modify field 100a
6) Save record

Thanks to Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> for
converting Vitor's original patch to a Git patch and doing
some tidying.

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Stephane Delaye <stephane.delaye@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 311c927876)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 12:58:02 +01:00
Zeno Tajoli 27596b0c6a Bug 11174: fix OPAC search links built from authority 5xx fields
In the templates opac-authoritiessearchresultlist of prog and
bootstrap the incorrect parameter 'valuec' is changed to 'value'

To test:

1) Insert an authority record with a 5xx field  (on MARC21 or UNIMARC)
2) Index the record
3) Search for the record in using OPAC authorities search.
4) Click one of the "see also" links built from the 5xx field, the link
   doesn't work
5) Apply the patch
6) Close the browser
7) Open the opac and select the english interface
8) Redo the search
9) Now the link works
10) To use the patch in others languages you need to regenerate the
    templates.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested with bootstrap.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Following commit remove the use to valuec:
 commit 31f41e2c1d
    Bug 8206: Specify index in OPAC authority search

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 09fcd69803)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 12:56:22 +01:00
Colin Campbell 6c05ac06c2 Bug 10983: Remove unused private subroutines from C4::Budgets
The subroutine _filter_fields is not used by the module
and the sub _columns is only used by it

This patch removes the dead code.

To test:

[1] Verify that the following tests pass

    t/Budgets.t
    t/Budgets/CanUserModifyBudget.t
    t/Budgets/CanUserUseBudget.t
    t/db_dependent/Acquisition.t
    t/db_dependent/Acquisition/GetOrdersByBiblionumber.t
    t/db_dependent/Acquisition/Invoices.t
    t/db_dependent/Acquisition/OrderFromSubscription.t
    t/db_dependent/Acquisition/TransferOrder.t
    t/db_dependent/Acquisition/close_reopen_basket.t
    t/db_dependent/Bookseller.t
    t/db_dependent/Budgets.t
    t/db_dependent/Serials.t
    t/db_dependent/Serials_2.t

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Looks good to me.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit befc07c754)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 12:52:58 +01:00
Robin Sheat 7cb5ff104b Bug 11284: Packaging updates for master branch
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 12:44:49 +01:00
Galen Charlton 7829496f11 Bug 11009: (follow-up) tweak wording and remove potential log noise
This patch makes the message that is displayed when attempting to
view circ history for the anonymous patron more informative.  It
also removes a potential source of log noise if the AnonymousPatron
system preference happens to be set to a blank value.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit d92dbae681)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 12:10:05 +01:00
Fridolyn SOMERS e67b6862f9 Bug 11009: Do not display circulation history of anonymous patron
When using an anonymous patron to anonymise issues history, this patron
may have a huge number of old issues. In this case, trying to display
the reading history of this patron will perform a huge SQL query.
It is not useful to have the reading history of this anonymous patron.

This patch adds an alert instead of old issues when displaying reading
records of anonymous patron.

Test plan :
- Set syspref AnonymousPatron to 0.
- Select a borrower with old issues. For example 123.
- Look at its reading records page : members/readingrec.pl
=> Old issues are displayed in a datatable
- Set syspref AnonymousPatron with this borrower number. For example 123.
- Look at its reading records page
=> Old issues are not displayed and an alert is displayed
- Using SQL query, remove old issues of this borrower :
    DELETE FROM old_issues WHERE borrowernumber=123.
- Look at its reading records page
=> A message is displayed

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

This works as advertised and seems like a reasonable thing to do. I
suspect that someone will object... Perhaps that person will implement a
solution which uses an AJAX DataTable.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit f2ad1faa63)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 12:09:49 +01:00
Galen Charlton e3858f7f63 Bug 11112: (follow-up) add FIXME
The caching introduced by the main patch is not ideal
as it won't work correctly if a persistance engine is used.

However, I have good reason to expect that bug 8089 will
be worked on (because I'm going to do it) so that Koha::Cache
can be used for this prior to the release of 3.16.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit aca1f5f6a9)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 11:52:58 +01:00
Galen Charlton e8779ef701 Bug 11112: (follow-up) repair Koha::Calendar->add_holiday()
This patch ensures that the package-level cache is updated
when add_holiday() is used.  Note that except for the test
case added by this patch, there doesn't seem to be anything
that actually calls ->add_holiday(); it may be better to remove it.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 08c47cbfe2)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 11:52:50 +01:00
Jonathan Druart 985debedec Bug 11112: Koha::Calendar needs some caching
Each time a Koha::Calendar object is created, its constructor retrieves
all holidays from the database and create a DateTime::Set object with
all holidays.

[RM note: I've observed that the time it takes DateTime::Set to be
 initialized with a set of dates increases faster than linearly with
 the number of dates.  I think this, more than just retrieving a bunch
 of holidays from the database, is what is most expensive.]

In one of our customer's DB, there are 11085 special_holidays and 598
repeatable_holidays. When a loan is returned, there are 3 calls to
Koha::Calendar->new.

This patch adds caching of the holiday list via package-level variables
as well as lazy fetching of the holidays. (RM note: this means that if
a persistance engine is in use, updates to the holiday list will not
be reflected during checkout.  I'm allowing this breakage for now on
the plan that bug 8089 will be fixed soon and we can switch to using
Koha::Cache).

Nytprof benchmarks (on a 3.8.x branch):
In DateTime::Set->from_datetimes:
3 times (5.49ms+4.90s) by Koha::Calendar::_init at line 80 of Koha/Calendar.pm, avg 1.63s/call
on a total of 7.67s (of 10.2s), executing 6353333 statements and 3031273 subroutine calls in 147 source files and 36 string evals.
for the circulation/return.pl page.

Comparing the access_log:

Without the patch:
checkout: time=2759838
checkin: time=1832751

Without the patch and with overdues:
checkout: time=1086727 + time=1144706
checkin: time=3928854 (x2)

With the patch and overdues:
checkout: time=1077839 + time=1060886
checkin: time=2420898

Test plan:
- checkout an item with a return date < today
- checkin the item and verify the suspension period is well calculated
  (depending on the holidays).
- prove t/db_dependent/Holidays.t
- t/Calendar.t

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit a98b239dbf)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 11:52:42 +01:00
Colin Campbell b8df5e3976 Bug 11032: Check a valid MARC::Record passed to Biblio
Intermittently problems in the calling environment
cause a C4::Biblio routine to be called with an undefined
MARC::Record object. This results in the process
dying and returning to the end user a low level
message such as 'cannot call method x on an undefined
object'.

For exported subroutines taking a MARC::Record object,
check that object is defined otherwise return a logical
return value and log a stack trace to the error log.
A couple of cases were checking but dying, this may have
unwelcome results in a persistent environment so croak has
been downgraded to carp

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

Adds lots of checks for $record in various places, should
not affect behaviour.
Passed all tests and QA script, including new unit tests.
Tested adding and saving a new record.
Also tested detail and result pages without XSLT.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 2e0e15485e)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 11:50:36 +01:00
Jonathan Druart 6d16356a1a Bug 10605: fix encoding issue on basket email (INTRANET)
Same fix for the staff interface.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Both patches tested with English and German, diacritics
now appear correctly if UTF-8 is selected as encoding.
Passes all tests and QA script.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 62fcbea10a)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 11:10:14 +01:00
Jonathan Druart adb91828bd Bug 10605: fix encoding issue in basket email (OPAC)
There is an encoding issue on the received mail.
Here, we have to keep the encode_qp in order not to break links (= is a
special char for email https://en.wikipedia.org/wiki/MIME#Encoded-Word).

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 4290fa60ef)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
2013-12-24 11:10:08 +01:00