Commit Graph

14955 Commits

Author SHA1 Message Date
Chris Cormack a70359a762 Bug 7432 : Fixing caching for C4::Languages
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit efd26a44d5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit dcecfda7a4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:49 -05:00
Chris Cormack 6129892124 Bug 7432 : Fixing caching for SQLHelper
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 516abc4896)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit e552cfe294)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:48 -05:00
Chris Cormack 3ea87319c4 Bug 7432 : Fix how we are setting expiry time when caching
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 70237c49ef)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit af646750e0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:48 -05:00
Owen Leonard ec03815d92 Bug 6598 [REVISED] OPACFineNoRenewals syspreference does not stop user renewing in opac
This patch standardizes the condition under which renewal controls
are displayed at the page (as opposed to item) level. In some
places "canrenew" was used, in others "patron_flagged" was used.
Now "canrenew" controls renew controls and "patron_flagged" only
triggers the display of user warnings.

This patch also allows for renewal information to be displayed
for each item in situations where OPAC renewals are allowed but
disabled for whatever reason. This gives the patron information
about used/available renew counts but hides renew controls.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0027fe0cc3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 02e56cdcac)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:48 -05:00
Chris Nighswonger cf1786d1c3 Updating Version Number to 3.04.08.001 2012-02-19 22:27:47 -05:00
Tomas Cohen Arazi 793bbd57bd Bug 6299 - Advertise this addition during upgrade
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
August 10, 2011: Fixed some small typos.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Oct 7th, 2011: rebased for master

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
- backported to 3.6.x

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
- backported to 3.4.x
2012-02-19 22:27:47 -05:00
Tomas Cohen Arazi 87d51ed2ef Bug 6299 - add es-ES
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Confirmed that the RELTERMS authorised values category is populated. Not
knowing Spanish I can't comment on the translations, but any errors can be
corrected at a later date.
(cherry picked from commit 1142b189f2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit fa3a2cbedb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:47 -05:00
Frédéric Demians 0b65abc89d Bug 6299 Add relator codes for fr-FR
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Confirmed that the RELTERMS authorised values category is populated. Not
knowing French I can't comment on the translations, but any errors can be
corrected at a later date.
(cherry picked from commit 147a3f8b97)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit d5148aac15)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:46 -05:00
Tomas Cohen Arazi 0f9a3765a9 Bug 6299 - Provide a list of authorized values for Relator terms
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
August 10,2011: Tested install and upgrade.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
January 28, 2012: Removed untranslated non-en SQL relator term files.
(cherry picked from commit 211a10c83a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit ed6d424407)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:46 -05:00
Julian Maurice 3fe0c347c2 Bug 6838: Add pagination and filtering on subscriptions table
Use dataTables plugin

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2916ddae4a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit e13db856d4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:46 -05:00
Chris Cormack 2c3585270c Bug 5327 : Removing a broken test
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 181f3b36ee)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 6f251690ff)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:45 -05:00
Jared Camins-Esakov cf58ab9f75 Bug 7345: Enable exporting records sans private fields
Add an option for marcstd to the opac-export.pl and catalogue/export.pl
scripts. This new format removes all 9XX, X9X, XX9 fields and subfield $9
(with the exception of 490 in flavours of MARC other than UNIMARC). The work is
done in C4::Record::marc2marc.

This patch adds the new export option 'marcstd' for exporting MARC
records without 9xx, x9x and xx9 fields and subfields to the staff
detail page.

Testing plan:
1. Export a record in "MARC (Unicode/UTF-8)" format as a control
2. In the OPAC, run the following jQuery to add the marcstd option to the UI:
> $("#export #format").append("<option value='marcstd'>MARC (no 9xx)</option>");
3. Export the same record in "MARC (no 9xx)" format
4. Compare the two, noticing that any subfield $9 or fields including 9 (other
   than 490 in flavours of MARC other than UNIMARC) have been removed

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Works as advertised now.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
This patch squashes both the original patch and Katrin's follow-up adding
marcstd as an export option on the staff client.

Feb 13, 2012 (marcel): Amended this patch to resolved two definitions of $error in catalogue/export script.
(cherry picked from commit 6378436089)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 2bb717247a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:45 -05:00
Paul Poulain 2bace14e5c Bug 7511 [ENH] Template caching (T::T feature)
Just add to your Koha configuration file
<template_cache_dir>/path/writable/by/apache/user</template_cache_dir>
in the <config> block, and Koha will use template caching, for about
10% CPU time saving.

on linux servers, /tmp is usually OK

(also fixes an indenting with a TAB)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
The results of using this are very striking. Based on an insufficient
sample size, it would seem that the time spent in T::T is reduced by a
factor of at least 5.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1161079e1f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 99583fe461)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:45 -05:00
Jared Camins-Esakov f70e8702c2 Bug 7501: OPAC auth browser should have alternating colors
Test plan:

1. Access authority browser in OPAC. Note that all rows have the same background
   color.
2. Apply patch, notice that colors now alternate.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 44fd379dc2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 4b1f2c01a1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:45 -05:00
Owen Leonard 7d5e0777d2 Bug 6865 - Follow-up, Replace image-based gradient backgrounds with CSS3 gradients
Staff client login screen has a separate CSS file which wasn't
included in the original changes for Bug 6865. This caused a 404
error (missing background image).

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tested in Chrome, FF, Safari, and IE8.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit ac3b4061b7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 471e913ce0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:44 -05:00
Frédéric Demians db296b7bb7 Bug 7505 Superlibrarian can't export all biblios when IndependantBranches is enabled
When a Koha user has superlibrarian permissions, and if
IndependantBranches is enabled, in Tools > Export bibliographic and
holdings, this user can't export all biblio records. He will just export
the biblio from the branch he belongs to.

This patch fix that.

To test:

  - Do a ALL records export as superlibrian on a multi-branches Koha instance
  - Examine the resulting MARC file with the tool of your choice (MArcEdit,
    yaz-marcdump, etc.)
  - You will see that 952/995 contains exlusively items from your branch (as
    Koha user)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 78f2ac2862)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 4140acb9bf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:44 -05:00
Duncan Tyler e779f18eef Small fix to allow help popup in IE9, not 7 or 8 - bug 7339
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 3317d16029)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit e1c042627e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:44 -05:00
Chris Cormack 1b92fdb88a Bug 929 : Follow up, shifting test
(cherry picked from commit 6a06860f0c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 07af219057)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:43 -05:00
Janusz Kaczmarek c89bf64dcb Error in records.abs for marc21/biblios
http://bugs.koha-community.org/show_bug.cgi?id=7502
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c1e47b9359)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 9eb816d3d2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:43 -05:00
Kyle M Hall e275e3fca8 Bug 6490 - Lost and paid not updated when book is checked out.
Signed-off-by: Liz Rea <wizzyrea@gmail.com>

Tested:

item checked out and marked lost - item is removed from borrower's checkouts and charged to patron
Checking out the item (without checking it in first) removed the fines and issued the item normally.

Passed prove t xt t/db_dependent (results congruent with current master failures)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 58c62f69c1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 4ca8de0dd2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:43 -05:00
Owen Leonard e5b6e51b74 Bug 7466 - Cart notification popup should appear onscreen even when button isn't
This patch compares the scroll position of the window with the page
position of the cart button and displays the cart notification
popup at the top of the visible page if the cart button has moved
offscreen.

Includes fix for OPAC and staff client.

Signed-off-by: Aleksa Vujicic <aleksa@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1eb0cbc5bf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 53be89a5f0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:42 -05:00
Frédéric Demians c0c7006213 Bug 6314 XSL UNIMARC Improvments
- Exclude 'marc' & 'item' prefix from UNIMARC util XSL to slim down
  result
- Add missing NSB/NSE characters striping
- 200 fields on result/detail page: show all subfields in order, link to
  detail page only on $a
- 4xx display, more fields and more subfields, respects subfields order
  which matter
- Improve RAMEAU authorities linkings to subdivisions (pure XSLT)
- Add missing fields: 205, 500
- Add missing MARC21 syspref:
  - DisplayOPACiconsXSLT, not implemtable in UNIMARC
  - OPACURLOpenInNewWindow
  - URLLinkText
  - ShowISBD
  Sidenote: this should have been done by people having introduced those
  syspref into MARC21 XSL.

Suite

http://bugs.koha-community.org/show_bug.cgi?id=6314
Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit fd84f8c2bc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit afb6db9aee)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:42 -05:00
Garry Collum c4f9f7d473 Bug 5674: patron name sort ignoring case when placing holds.
Fixes the patron name sorting when placing holds.

Testing - See Bug 5674.
Create two patrons.  One named SMITH, THOMAS and the other Smith, John.
Search for an item to place on request.  Do a patron search for Smith.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Confirm both the original bug and the fix, sorting is correct now.
Patch does not change status of tests - prove t t/db_dependent xt no different from master.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit e1d948ecd6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 07524b0de3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:42 -05:00
Chris Cormack 8e702f32a8 Bug 7238 : Shifting SIPconfig.xml to the etc dir and the scripts to misc/bin
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
The scripts run with the caveat that you must specify the path to SIPconfig.xml. The followup previously attached should take care of that issue.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 43b3fb9701)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 36cf50e27d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:42 -05:00
Liz Rea 9a520ae0ea Bug 7238 Followup - fix sip_run to require path to SIPconfig.xml
This requires Chris C's patch to move the scripts to the new location outside of C4.

To test:
run sip_run.sh with no arguments - it should fail with a message to add the path and try again.

Run sip_run.sh with a path to a valid SIPconfig.xml - it should start and run.
(cherry picked from commit 866bb561dc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit d76424a17c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:41 -05:00
Owen Leonard 3a44fa8253 Bug 7461 - Cart offering to remove items when closing
The "hide window" button in the cart called a quit() function
which deletes any checked items. My understanding of the "hide
window" button is that it should *only* hide the window, not
perform any other operations. I'm removing the calls to the
quit() function in both the OPAC and staff client and adding
a CSS class, "close," which is already tied via jQuery to
the window.close() function.

To test in both OPAC and staff client: Add items to the cart.
Try clicking the "hide window" button with items selected and
without. In both cases the window should close without affecting
the contents of the cart.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 5528b06fda)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit fc411c3c7e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:41 -05:00
MJ Ray 4f44239310 Bug 7476 Remove executable bit from files that probably should not be executed
Signed-off-by: Aleksa Vujicic <aleksa@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Amended to replace some copy-and-paste comments only with consent of MJR.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d4b132136c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit b7bc2fce01)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:41 -05:00
Marcel de Rooy b259cb1716 Bug 7459 - Can only add to one public list in OPAC search results
This makes the second and higher public list appear again in the AddTo combo of the search results screen.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 724e0d520d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit cc54fa95ab)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:40 -05:00
Garry Collum 6a120f28ba Bug 6984 - Holds statistics doesn't work.
This patch fixes several errors in reserves_stats.pl and reserves_stats.tt.

Testing -
To test this patch, data must be in either the reserves table or old_reserves or both.  The following SQL will give you the raw data that is used by the report.

SELECT priority, found, reservedate, notificationdate, reminderdate,
waitingdate, cancellationdate, borrowers.categorycode, items.itype,
reserves.branchcode, holdingbranch, items.homebranch, items.ccode,
items.location, items.itemcallnumber, borrowers.sort1, borrowers.sort2
FROM reserves
LEFT JOIN borrowers on (borrowers.borrowernumber = reserves.borrowernumber)
LEFT JOIN items on (items.itemnumber = reserves.itemnumber)
UNION SELECT priority, found, reservedate, notificationdate, reminderdate,
waitingdate, cancellationdate, borrowers.categorycode, items.itype,
old_reserves.branchcode, holdingbranch, items.homebranch, items.ccode,
items.location, items.itemcallnumber, borrowers.sort1, borrowers.sort2
FROM old_reserves
LEFT JOIN borrowers on (borrowers.borrowernumber = old_reserves.borrowernumber)
LEFT JOIN items on (items.itemnumber = old_reserves.itemnumber)

To test the notificationdate and reminderdate, I added data to the old_reserves table, since I have never run notices on my test machine.

Ex:
UPDATE old_reserves
SET notificationdate = "2012-01-29",
reminderdate = "2012-01-29"
WHERE timestamp = "2012-01-29 20:09:34";

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Confirm original bug -- Reports work as expected now!
prove t xt t/db_dependent no different from master.
(cherry picked from commit 67825637be)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 7ac0d0b924)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:40 -05:00
Paul Poulain 3c9a5be3c9 bug 7450 small follow-up, removing warn
removing an unconditional warn. It was already here before the patch,
but my pre-applypatch script complained, so I fix as a follow-up
(cherry picked from commit 1034b21dea)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 4ede3c6453)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:40 -05:00
Adrien Saurat cb25cf8d7a Bug 7450: missing placeholders in authorised_values.pl
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Successfully added, edited and deleted authorised values.
No problems found.
(cherry picked from commit f0a6600934)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit ddba456f67)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:40 -05:00
Garry Collum 7630f22049 Bug 7431: Fixes the display of the due date in opac item specific holds.
Fixes the reference to the due date in opac-reserve from date_due to dateDue as defined int opac-reserve.pl.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit cf15a0e427)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 7b7f04effa)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:39 -05:00
Frédéric Demians 59fce3a546 Bug 7355 Note subfields are not displayed in TEXTAREA if hidden
In the data entry form, there is a (hidden) functionality for note subfields.
MARC21 500-599 and UNIMARC 300-399 subfields are displayed in TEXTAREA rather
than INPUT tags. This is good since usually notes can be pretty long. But if
one of those fields is marked in the framework as 'hidden', then it isn't
displayed at first when you create a record and when you expand the field by
clicking on its label the field is displayed in a one-line INPUT tag.

To reproduce this bug:

- Modify your framework:
  MARC21: 500$a, hidden=1
  UNIMARC: 300$a, hidden=1
- Create a new biblio record with this framework
- Open the tab containing 500 or 300 field
- 500 or 300 tab is collapsed
- Click on 500 or 300 label to expand the field
- 500$a or 300$a is displayed in a one-line INPUT tag, not in a TEXTAREA
  as it should

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan works. Also checked cloning and deleting
subfields still works.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Works as advertised. Simplifies code too. Well documented test plan.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 86406bcf91)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 1de265140a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:39 -05:00
Paul Poulain d5f38c7807 Bug 6210 follow-up, removing warn
See http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6210#c27
and http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6210#c28
(cherry picked from commit 1637af349e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 88536c2ac0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:39 -05:00
Paul Poulain a705f76292 Bug 6488 adding a 2nd \n to silence logs
YAML don't like when you try to open a YAML file with just a \n. This patch add a 2nd \n to silence logs.
(cherry picked from commit 1f66e9fa69)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 29beeced80)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:38 -05:00
Owen Leonard 1481244d1f Fix for Bug 7148 - Add some error handling to Acquisitions' Z39.50 search to match Cataloging's
- Copying over error handling for timeout(10007) and refused(10000)
- Copying over error handling for submission with no targets chosen
- Correcting "cancel" link in the template which was not modified
  when it was copied from cataloging's popup window template.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 952bfc6f07)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 4f50ffb82e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:38 -05:00
Robin Sheat ec5e471252 Bug 6913 - change how ports are handled by koha-create
This does two things:
* Allows OPACPORT to be specified to change the default OPAC port,
* removes the port number from the ServerName directive, as it's already
  handled by the VirtualHost declaration.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4437737858)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 2169771262)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:38 -05:00
Paul Poulain ee67015b2b Adding Jorgia Kelsey and Peter Lorimer as contributors
(cherry picked from commit f68d56bbab)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 05b863d0f6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:38 -05:00
Henri-Damien LAURENT 637f86d631 Bug 6842 FU : library transfer limits edits not stored
Followup :
Changes the DeleteBranchTransferLimits signature :
one now needs to delete only the limits for ONE branch
(cherry picked from commit 54e6b44da9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit c2b6b82336)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:37 -05:00
Paul Poulain 81ea1808d1 adding 3 contributors from catalyst OpenSource academy
they contributed tests
(cherry picked from commit 563fcd1fd1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 6c0eaa0f47)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:37 -05:00
Robin Sheat b0d7bf8913 Bug 5327 - move another test around
(cherry picked from commit 8aacb28fc0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 316dc62867)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:37 -05:00
Chris Cormack e773268666 Bug 5327: Shifting a db dependent test to the right place
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
(cherry picked from commit 227cafe8c2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit e0612c01d9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:37 -05:00
Paul Poulain 9898eafff7 bug 6631 follow-up adding author in contributors list
(cherry picked from commit 4cb60dbbe2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 8c3ea52ded)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:36 -05:00
Aleksa Vujicic ee9ad71804 Bug 6631: Anonymous users can create lists in OPAC
Made opac-addbybiblionumber.pl page require authentication.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8eb727d671)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit bf29ff10d3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:36 -05:00
Paul Poulain 5adcc80a55 Bug 6539 follow-up, fixing wrong indentation
(cherry picked from commit 64da5af31d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit aa2d2fd7cc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:36 -05:00
Peter Lorimer b59144ad54 Bug 6539 - When searching the catalogue, if I get no results then hit the Z39.50 search the title field in the pop up window is populated with what I searched for.
If I search for a valid ISBN number and hit the Z39.50 search, the title field
is populated with the ISBN number I searched for. This number should populate
the ISBN field and not the title field.

http://bugs.koha-community.org/show_bug.cgi?id=6539
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

To test:
- Search new ISBN using ISBN search from advanced search page
- 0 results - click on Z39.50 search
- Z30.50 form will have your ISBN in ISBN search option

I am signing off on this, because it's an improvement over the current
behaviour.

I see some  problems though that should perhaps be addressed in a separate
bug or as a follow-up:

If you use th catalog search field and search for an ISBN or
a keyword the right fields of the Z39.50 search form will be populated, but
the search index will be put in front:

ISBN: kw,wrdl: 9783492251495
or
Title: kw,wrdl: koha testing

If you search for ISBN as keyword on the advanced search page, it will
still populate the Title search.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 22aed769a6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit aaf019a020)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:35 -05:00
Owen Leonard 459fbc4098 Bug 6210 - Follow up, Choose framework on merge
- Adding subtitle to the display of titles to be merged
- Adding a link to preview the MARC record of titles to be merged
- Fixing up markup of form to improve appearance
- Correcting breadcrumbs

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 049ac6e2a7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 8b3bb800dd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:35 -05:00
Srdjan Jankovic cc5a84def3 bug_6210: Select framework if merging two records with different frameworks
ModBiblio() - set framework to "" if "Default"

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

All 4 tests passed:

Test 1:  Merge two records with the same framework
    Desired result:  shouldn't get any prompting to pick a framework, and the
same framework should be used

    Test 2:  2 records, different frameworks, into the kept record's framework
    Desired result:  merge with kept records framework used

    Test 3:  2 records, different frameworks, into the discarded record's
framework
    Desired result:  merge with used records framework used

    Test 4:  2 records, different frameworks, into a third framework
    Desired result:  merge with third framework used
(cherry picked from commit 91d870f67a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 9f99173ac4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:35 -05:00
Srdjan Jankovic b95d437058 bug_6488: Take in account opachiddenitems when searching in opac
Changed searchResults() interface
Added trailing \n when parsing OpacHiddenItems to make YAML happy
XSLTParse4Display() and buildKohaItemsNamespace() take hidden
items as input param
Removed numbering from the search results, looks wrong with
hidden items

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 706712dd1e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 58edcf7ab7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:34 -05:00
Sam Sanders 11b735f8c3 Bug 5327 added tests for C4/Languages.pm
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit a0c1414f6d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit ed9eac7dd0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-02-19 22:27:34 -05:00