]> git.koha-community.org Git - koha.git/log
koha.git
12 years agoError in records.abs for marc21/biblios
Janusz Kaczmarek [Mon, 6 Feb 2012 14:44:36 +0000 (15:44 +0100)]
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 c1e47b9359a77b6812173b7b23934bbc154a88e4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7127 - Templates must be valid XHTML
Owen Leonard [Tue, 1 Nov 2011 18:14:51 +0000 (14:14 -0400)]
Bug 7127 - Templates must be valid XHTML

Replaces & with &amp; on several template pages

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit 311dbc8bc1d5c89eff73d4e33c598c9435025ce6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6490 - Lost and paid not updated when book is checked out.
Kyle M Hall [Thu, 2 Feb 2012 15:15:43 +0000 (10:15 -0500)]
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 58c62f69c1cabf31840006531338f9362f0a1e0e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7466 - Cart notification popup should appear onscreen even when button isn't
Owen Leonard [Tue, 24 Jan 2012 20:46:20 +0000 (15:46 -0500)]
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 1eb0cbc5bf728f6cdb64b5cf102f227df1efb617)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7453: All patrons should have an expiry date
Katrin Fischer [Fri, 20 Jan 2012 07:08:24 +0000 (08:08 +0100)]
Bug 7453: All patrons should have an expiry date

Fixes sample data. All patrons should always have an expiry date.

To test:
Load sample patron data and check that all patrons have an expiry date.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6314 XSL UNIMARC Improvments
Frédéric Demians [Fri, 6 May 2011 06:43:34 +0000 (08:43 +0200)]
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 fd84f8c2bcdc01fc753c6b281f13e387586199cc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5674: patron name sort ignoring case when placing holds.
Garry Collum [Wed, 1 Feb 2012 17:35:27 +0000 (12:35 -0500)]
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 e1d948ecd69b802917272b2bc73e11fabc2a0e88)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6323 -- Error handling cleanup for moveitem.tt
Liz Rea [Wed, 28 Sep 2011 14:04:14 +0000 (09:04 -0500)]
Bug 6323 -- Error handling cleanup for moveitem.tt

Added button to retry attaching item, added default bib view handling, cosmetic changes to the error display (buttons now in error div).

Incorporates changes that should satisfy QA.

To test:
Find a bib with multiple items and grab one of the barcodes.
Go to a second bib and click Edit -> Attach item
Paste your barcode in there and click "Submit"
Click the "Try again with a different barcode" button. It should take you back to the barcode entry screen.

Also try with a non-existent barcode and verify that the button appears and works as intended.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7238 : Shifting SIPconfig.xml to the etc dir and the scripts to misc/bin
Chris Cormack [Thu, 17 Nov 2011 00:17:01 +0000 (13:17 +1300)]
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 43b3fb97015c16d159f67b758ff01483890b42d1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7238 Followup - fix sip_run to require path to SIPconfig.xml
Liz Rea [Sun, 1 Jan 2012 03:41:03 +0000 (21:41 -0600)]
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 866bb561dc4dc92b587be177a7c8261b58439a3d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7461 - Cart offering to remove items when closing
Owen Leonard [Tue, 24 Jan 2012 14:10:46 +0000 (09:10 -0500)]
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 5528b06fda325396484a3841d08687c697bc8ca6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7472 Edit button ineffective when paying borrower fee
Frédéric Demians [Thu, 26 Jan 2012 09:39:52 +0000 (10:39 +0100)]
Bug 7472 Edit button ineffective when paying borrower fee

On payment page, the Edit button doesn't load anymore the current
borrower edit page.

To reproduce the bug:

- Define a borrower category 'foo' with Enrollment fee
- Create a new 'foo' borrower
- Click on Check out tab
- A message is displayed: Fees & Charges: Patron has Outstanding fees &
  charges of xx.00. Checkouts are BLOCKED because fine balance is OVER
  THE LIMIT. Make Payment
- Click on Payment link
- Click on Edit button
- You reach a page for creating a new borrower
  => you should reach the current borrower edition page

- Same issue on paycollect.tt template

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7476 Remove executable bit from files that probably should not be executed
MJ Ray [Mon, 30 Jan 2012 21:06:57 +0000 (21:06 +0000)]
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 d4b132136cef6204dd074205aef94b6b0efc6930)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7459 - Can only add to one public list in OPAC search results
Marcel de Rooy [Mon, 9 Jan 2012 12:10:51 +0000 (13:10 +0100)]
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 724e0d520df63bfbe5dfdf4d8ea0aedd7889f9d1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6984 - Holds statistics doesn't work.
Garry Collum [Wed, 1 Feb 2012 15:15:46 +0000 (10:15 -0500)]
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 67825637beb8ce3fabb7f34548f6962dec2993e5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 7450 small follow-up, removing warn
Paul Poulain [Fri, 3 Feb 2012 11:09:24 +0000 (12:09 +0100)]
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 1034b21dea0460b58ef63550cf920b17d5e2662e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7450: missing placeholders in authorised_values.pl
Adrien Saurat [Tue, 17 Jan 2012 11:00:32 +0000 (12:00 +0100)]
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 f0a660093442941ee11c0c2fe11402eebfa45a01)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7431: Fixes the display of the due date in opac item specific holds.
Garry Collum [Sat, 28 Jan 2012 19:36:18 +0000 (14:36 -0500)]
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 cf15a0e427d8b8166d1dde8dae6ad6bf1a6f7de9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7355 Note subfields are not displayed in TEXTAREA if hidden
Frédéric Demians [Wed, 14 Dec 2011 07:52:32 +0000 (08:52 +0100)]
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 86406bcf910d28691655d4a9a1490d34e669a6ee)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6210 follow-up, removing warn
Paul Poulain [Thu, 2 Feb 2012 14:35:26 +0000 (15:35 +0100)]
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 1637af349e4976c146d1ae5e1fb5b49aaaef288d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6488 adding a 2nd \n to silence logs
Paul Poulain [Thu, 2 Feb 2012 14:21:25 +0000 (15:21 +0100)]
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 1f66e9fa691f9cfd705375450a21c623e0155f52)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug_7190: Do not reverse writeoffs when item is returned
Srdjan Jankovic [Tue, 31 Jan 2012 02:36:44 +0000 (15:36 +1300)]
bug_7190: Do not reverse writeoffs when item is returned

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 7148 - Add some error handling to Acquisitions' Z39.50 search to match...
Owen Leonard [Thu, 3 Nov 2011 14:22:11 +0000 (10:22 -0400)]
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 952bfc6f0790e60425767272de578170cee63e4c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7005 follow-up fix coding guidelines broken
Paul Poulain [Thu, 2 Feb 2012 11:04:55 +0000 (12:04 +0100)]
Bug 7005 follow-up fix coding guidelines broken
(cherry picked from commit abdef00248903539ea9836bb43b7edcf28fabd02)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7005: Writeoff all now has a confirmation dialog.
Aleksa Vujicic [Thu, 19 Jan 2012 02:01:19 +0000 (15:01 +1300)]
Bug 7005: Writeoff all now has a confirmation dialog.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6913: More options for koha-create and koha-remove
Jared Camins-Esakov [Sat, 8 Oct 2011 19:34:24 +0000 (15:34 -0400)]
Bug 6913: More options for koha-create and koha-remove

This commit makes koha-create more flexible by adding a number of command-line
and configuration options.

The biggest change is to add support for pre-determined MySQL credentials using
a file in /etc/koha/passwd (for security reasons, if you use this feature, make
sure the file is not world-readable). The configuration file has the following
format:
instance:user:password:database
The database is optional, but the other two are both required if you want to
specify MySQL credentials. If no credentials are specified for a given instance,
the standard koha_instance username and an auto-generated password are used.

The following additional command line options are now available:
* --use-db - use a pre-existing database, see also --database
* --database - specify the name of the mysql database (still defaults to
  koha_instance)
* --passwdfile - specify a custom (Koha) passwd file for MySQL credentials

The following additional variables are now available (for use in
koha-sites.conf or a custom config file):
* OPACPORT (previously added but not documented) - port on which the OPAC
  should be served
* OPACPREFIX - prefix for the OPAC's virtual host
* OPACSUFFIX - suffix for the OPAC's virtual host

This commit also adds the --keep-mysql option to koha-remove, which, if
specified, will prevent koha-remove from deleting the database or MySQL user
when removing an instance.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 297d22459f670212624d22a0e48447799004935b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6913 - change how ports are handled by koha-create
Robin Sheat [Sun, 25 Sep 2011 23:04:13 +0000 (12:04 +1300)]
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 44377378582a1cbe9b38858f81d33dd1480a195d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdding Jorgia Kelsey and Peter Lorimer as contributors
Paul Poulain [Thu, 2 Feb 2012 08:06:51 +0000 (09:06 +0100)]
Adding Jorgia Kelsey and Peter Lorimer as contributors
(cherry picked from commit f68d56bbab77d6330d8f657a3a3de508e0b1224d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6842 FU : library transfer limits edits not stored
Henri-Damien LAURENT [Thu, 22 Dec 2011 05:23:35 +0000 (06:23 +0100)]
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 54e6b44da956190bb555045e522e6ed6ce49229e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6842 Alternate fix, Branch transfer limits broken
Owen Leonard [Wed, 28 Dec 2011 16:41:16 +0000 (11:41 -0500)]
Bug 6842 Alternate fix, Branch transfer limits broken

The patch which moved the table pager markup into an
include undid the fix which was previously pushed for
this problem. Re-implementing the fix in the pager
include is a simpler fix which doesn't depend on
the Datatables plugin.

The markup change in table-pager.inc fixes the problem
in branch transfer limits and does not affect functionality
on other pages.

The changes in this patch to branch_transfer_limits.tt and
staff-global.css are for cosmetic reasons only.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Saving changes works now correctly. I tried:
- uncheck all for a branch
- check all for a branch
- making changes for different itemtypes on different tabs

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
- backported to 3.6.x

12 years agoadding 3 contributors from catalyst OpenSource academy
Paul Poulain [Wed, 1 Feb 2012 17:23:16 +0000 (18:23 +0100)]
adding 3 contributors from catalyst OpenSource academy

they contributed tests
(cherry picked from commit 563fcd1fd11402d4644b20eef4dbe970ff92f544)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 - move another test around
Robin Sheat [Wed, 1 Feb 2012 00:52:53 +0000 (13:52 +1300)]
Bug 5327 - move another test around
(cherry picked from commit 8aacb28fc02323367f33f96ca83730342fda97ea)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327: Shifting a db dependent test to the right place
Chris Cormack [Mon, 30 Jan 2012 23:48:13 +0000 (12:48 +1300)]
Bug 5327: Shifting a db dependent test to the right place

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
(cherry picked from commit 227cafe8c2d7fd321c77a807d1196f43d5ba450a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 6631 follow-up adding author in contributors list
Paul Poulain [Wed, 1 Feb 2012 16:56:42 +0000 (17:56 +0100)]
bug 6631 follow-up adding author in contributors list
(cherry picked from commit 4cb60dbbe21a58d62c66908a600fce5d306601fd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6631: Anonymous users can create lists in OPAC
Aleksa Vujicic [Tue, 24 Jan 2012 01:09:34 +0000 (14:09 +1300)]
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 8eb727d671f8a264afb3e978a9046c151ed072a9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6539 follow-up, fixing wrong indentation
Paul Poulain [Wed, 1 Feb 2012 16:51:05 +0000 (17:51 +0100)]
Bug 6539 follow-up, fixing wrong indentation
(cherry picked from commit 64da5af31d76471b9552df0366d71db742fdb84c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6539 - When searching the catalogue, if I get no results then hit the Z39.50...
Peter Lorimer [Thu, 30 Jun 2011 08:47:55 +0000 (09:47 +0100)]
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 22aed769a69fd3b6d1864889d9f63406d92052f9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6210 - Follow up, Choose framework on merge
Owen Leonard [Tue, 24 Jan 2012 15:44:11 +0000 (10:44 -0500)]
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 049ac6e2a7182a65cc83cea352ab377c3bec6924)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug_6210: Select framework if merging two records with different frameworks
Srdjan Jankovic [Mon, 19 Dec 2011 06:22:49 +0000 (19:22 +1300)]
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 91d870f67aa4b6a4784794e77304fcf759675184)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug_6488: Take in account opachiddenitems when searching in opac
Srdjan Jankovic [Mon, 23 Jan 2012 04:04:02 +0000 (17:04 +1300)]
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 706712dd1edebb6eed8b632ca8db4dcd9df39b56)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 added tests for C4/Languages.pm
Sam Sanders [Thu, 19 Jan 2012 01:15:45 +0000 (14:15 +1300)]
Bug 5327 added tests for C4/Languages.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit a0c1414f6d7e431dd0c6bc55f0dd11b55951df81)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 Added unit tests for C4/SIP/ILS/Transaction/Renew.pm
Connor Dewar [Wed, 18 Jan 2012 02:33:43 +0000 (15:33 +1300)]
Bug 5327 Added unit tests for C4/SIP/ILS/Transaction/Renew.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 597fabf4f474c52d0c9fc3f9fa9ce0267f6e04e2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 added unit tests for C4/TmplToken.pm
Bart Jorgensen [Wed, 18 Jan 2012 23:08:58 +0000 (12:08 +1300)]
Bug 5327 added unit tests for C4/TmplToken.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 37c9ffcf7d12dcd3218fa7956c7a9adf5604a7b2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 added unit tests for C4/Search_PazPar2.pm
Kate Henderson [Wed, 18 Jan 2012 22:24:00 +0000 (11:24 +1300)]
Bug 5327 added unit tests for C4/Search_PazPar2.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 66fecdd798fa499e9184c5b70b252d36f4b64235)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 added unit tests for C4/Scheduler.pm
Kate Henderson [Thu, 19 Jan 2012 01:29:53 +0000 (14:29 +1300)]
Bug 5327 added unit tests for C4/Scheduler.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 1e2e7b9dd8614dd7729ecdebb6b6c99ad52d602a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 5327 added unit tests for C4/Ris.pm
Sam Sanders [Wed, 18 Jan 2012 02:38:52 +0000 (15:38 +1300)]
bug 5327 added unit tests for C4/Ris.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 0618b9db72b548a962c5e235397e1cdb6feb0f13)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 added unit tests for C4/Creators/PDF.pm
Jono Mingard [Thu, 19 Jan 2012 01:31:57 +0000 (14:31 +1300)]
Bug 5327 added unit tests for C4/Creators/PDF.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit e81cbd7fe0064519fa86f96b2dc4a7800b5e3c67)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 added unit tests for C4/ClassSortRoutine/LCC
Sam Sanders [Tue, 17 Jan 2012 20:39:55 +0000 (09:39 +1300)]
Bug 5327 added unit tests for C4/ClassSortRoutine/LCC

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 200b5a8231d800a5bec0e57a5cdd0030aa248f75)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 added unit tests for C4/Barcodes_PrinterConfig.pm
Jorgia Kelsey [Wed, 18 Jan 2012 23:30:05 +0000 (12:30 +1300)]
Bug 5327 added unit tests for C4/Barcodes_PrinterConfig.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 1a20feb4caa812d49eb8861b06ebc81164ea66c1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 added unit tests for C4/AuthoritiesMarc/MARC21.pm
Jono Mingard [Wed, 18 Jan 2012 22:03:59 +0000 (11:03 +1300)]
Bug 5327 added unit tests for C4/AuthoritiesMarc/MARC21.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 5579abe41f5ab6ce04761545efe1d423faa037d6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 added tests for C4/Labels.pm
Sam Sanders [Thu, 19 Jan 2012 00:53:15 +0000 (13:53 +1300)]
Bug 5327 added tests for C4/Labels.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 3b9722c7dd08009a7baabdb84ad108462a1ba3c4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 5327 added unit test for C4/Csv.pm
Sam Sanders [Thu, 19 Jan 2012 03:18:48 +0000 (16:18 +1300)]
bug 5327 added unit test for C4/Csv.pm

Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit f918c57e89d7dcc2ce0f824e54ca3285fc511f69)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7460: Add template toolkit's FILTER html_line_break on opac details description...
Stéphane Delaune [Mon, 23 Jan 2012 15:06:47 +0000 (16:06 +0100)]
Bug 7460: Add template toolkit's FILTER html_line_break on opac details description's tab

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7446: Redundant display of availablecount in results.tt in staff client.
D Ruth Bavousett [Sun, 15 Jan 2012 15:51:30 +0000 (07:51 -0800)]
Bug 7446: Redundant display of availablecount in results.tt in staff client.

This tiny patch removes a redunant display.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 3806 - Holidays table doesn't order by date correcly
Owen Leonard [Tue, 6 Dec 2011 20:09:27 +0000 (15:09 -0500)]
Bug 3806 - Holidays table doesn't order by date correcly

Adding dateformat filter to JavaScript tablesorter
configurations.

Follow-up adds a custom date parser for dates without year ("01/10")

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested yearly repeatables under Calendar for all three date formats.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7350: In neworderempty.pl duplicating an item does not preserve select box selections
Christophe Croullebois [Sat, 10 Dec 2011 17:39:37 +0000 (18:39 +0100)]
Bug 7350: In neworderempty.pl duplicating an item does not preserve select box selections

cloneNode() does not preserve select box selections, I have created a function to duplicate them : "clone_with_selected".
It is included in "cloneItemBlock", that's all.
Now the values selected in ddl are duplicated as the imput-texts are.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7359 - Begin migration to a new "Koha" namespace from the old "C4" namespace
Chris Nighswonger [Wed, 14 Dec 2011 19:22:48 +0000 (14:22 -0500)]
Bug 7359 - Begin migration to a new "Koha" namespace from the old "C4" namespace

The Koha namespace is for Perl modules that meet the following mandatory
conditions:

* use "strict" and "warning" pragmata
* include valid POD
* include complete and functioning documented test cases
* not create circular dependencies
* use Object Oriented (OO) style everywhere possible
* minimize exports
* maintain mod_perl, etc. compatibility
* separate data access methods from business logic

Modules in C4 can use (and are encouraged to use) routines in
the Koha namespace.  Modules in Koha should not in general use C4
modules; any C4 module that is safe to be depended on by a Koha
module is a candidate for being renamed to Koha.

The advantage of carving out a new namespace is that it doesn't
require that we refactor the entirety of C4 to support persistance or
to untangle the dependency tree.  Instead, the only C4 code we would
have to reimplement for the Koha namespace right away would be
authentication, basic session management, and basic output.

(Gratuitous use made of gmcharlt's recommendations found in the
post mentioned below.)

Related info:

http://lists.koha-community.org/pipermail/koha-devel/2011-March/035302.html
http://wiki.koha-community.org/wiki/Namespace_QA_Rules

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit a984129e05cc0e20bf00029f5886cbb418cde898)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6836 follow-up fixing POD
Paul Poulain [Fri, 27 Jan 2012 12:58:20 +0000 (13:58 +0100)]
Bug 6836 follow-up fixing POD

this should please jenkins
(cherry picked from commit 19e3607c49f1cc1d0a19180781102054b2a4e716)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago7367 Removing reintroduced debugging statement from Auth.pm
Marcel de Rooy [Mon, 23 Jan 2012 13:18:50 +0000 (14:18 +0100)]
7367 Removing reintroduced debugging statement from Auth.pm

Commit 07d1eae7ccf5c8746251b666b6460440ecc26204 removed this statement from the module, but some months later commit 7b12e07d3ba44530d7ba33d09de01afef46bbfc7 reintroduced it again while reindenting code ;)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
(cherry picked from commit 9c0ce2bf3b01948b371c2389f958ba981a036031)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7157 follow-up: j2a.pl executable again
Paul Poulain [Fri, 27 Jan 2012 11:18:25 +0000 (12:18 +0100)]
Bug 7157 follow-up: j2a.pl executable again

This patch just update the permission of the script, that must be executable
(cherry picked from commit e8b83c665a9e419158369079381865ae5fb5d0af)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7157 - Improve the j2a.pl cronjob
Liz Rea [Fri, 4 Nov 2011 18:20:23 +0000 (13:20 -0500)]
Bug 7157 - Improve the j2a.pl cronjob

- Calculates updates date based on the upper age limit defined in the patron categories.
- Allows libraries to work on all branches or only one.
- Allows libraries to specify which Adult patron category to update child categories to.
- Allows libraries to specify a single Child patron category to update to an adult category.
- Has a test mode to display what transforms would be done on the database without executing the changes.

Includes improved help, copyright statement, and uses warnings. Also incorporates Paul's suggestions regarding --help and --man, changes -fromcat and -tocat to -f and -t, and removes a redundant update to categorycode (per M. deRooy).

To test:

Create two patron categories, a child and an adult category. Make sure they
have an upper age limit.

Create or modify some patrons in multiple branches that fall into the category
of "my birthdate is less than or equal to today's date minus the upper age
limit"

1. Run the script with no flags - nothing should  happen, it will suggest you try the --help flag.
2. Run the script with the --help flag - you should see the help
3. Run the script with the -f=<child category> -t=<adult category> -v -n - should show you results from all branches but take no action and tell you what its computations are.
4. Run the script with the -f=<child category> -t=<adult category> -b=<branchcode> -v -n - should show you results from your specified branch, but take no action and tell you what it's computations are.
5. Run the script with the -f=<child category> -t=<adult category> -v -b=<branchcode> - should show you the computations and tell you how many patrons were modified in your single branch. It will not show you the information on which patrons were updated.
6. Run the script with the -f=<child category> -t=<adult category> -v - should show you the computations and tell you how many patrons were modified across all branches.
7. Run the script without the -v flag, if you care what the non-verbose output looks like.

Fixed in this revision: Known limitation - if you give it an unknown tocat, it will fail with a rather ugly error.

Minor changes to the commit message to reflect new longopts (which I missed the last time)
There is more this script could do, please feel free to take it and run.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Bug 7157 : Follow up, fixing FSF address

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit fe1a642a1a06c38b55c2666ead4f4ff4ea3658da)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6752: Be stricter with utf-8 encoding of output
Colin Campbell [Wed, 6 Jul 2011 07:24:28 +0000 (08:24 +0100)]
Bug 6752: Be stricter with utf-8 encoding of output

use encoding(UTF-8) rather than utf-8 for stricter
encoding
Marking output as ':utf8' only flags the data as utf8
using :encoding(UTF-8) also checks it as valid utf-8
see binmode in perlfunc for more details
In accordance with the robustness principle input
filehandles have not been changed as code may make
the undocumented assumption that invalid utf-8 is present
in the imput
Fixes errors reported by t/00-testcritic.t
Where feasable some filehandles have been made lexical rather than
reusing global filehandle vars

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 263dded818da9d3ad0fa702f7bc848707e181211)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6836: test case readingrec.pl
Julian Maurice [Fri, 2 Dec 2011 09:27:11 +0000 (10:27 +0100)]
Bug 6836: test case readingrec.pl

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I tested the functionality and tested translation.
All important strings are in the template and can be translated.
Good work!
(cherry picked from commit 7d0761bbe997fa76f0d876c6bb5715b1e4883ecb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6836: followup CSS work
Owen Leonard [Fri, 2 Dec 2011 09:25:50 +0000 (10:25 +0100)]
Bug 6836: followup CSS work

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit fb928d48fc25812891860d699fe53ac4b503ec50)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6836: Add jQuery dataTables plugin
Julian Maurice [Fri, 8 Jul 2011 12:29:19 +0000 (14:29 +0200)]
Bug 6836: Add jQuery dataTables plugin

This patch add the javascript library, a CSS (and image files from
datatables.net) and another javascript file which provides some extra
features.
It also add a Perl module C4::Utils::Datatables which provides helpful
functions for server-side processing

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 8298250c49b6af3f88415e1daee748d4cd1574eb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6836: Adding dependency on Modern::Perl
Chris Cormack [Fri, 13 Jan 2012 04:16:51 +0000 (17:16 +1300)]
Bug 6836: Adding dependency on Modern::Perl

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c1ee7a750f090ee63e461bc5fe46ca08fc232245)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoUpdating perlcriticrc to allow Modern::Perl to suffice instead of use warnings; and...
Chris Cormack [Fri, 13 Jan 2012 04:08:24 +0000 (17:08 +1300)]
Updating perlcriticrc to allow Modern::Perl to suffice instead of use warnings; and use strict;

http://bugs.koha-community.org/show_bug.cgi?id=6836

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit c77b8756f769f83200628b19bc11e0be900577b9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agohistory.txt removing a useless tab
Paul Poulain [Tue, 24 Jan 2012 10:02:08 +0000 (11:02 +0100)]
history.txt removing a useless tab
(cherry picked from commit 572233de4a0148b2140650abf5401bd0bf16612a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6350 - Adding new developers to history.txt Jesse Maseto Connor Dewar Sam Sanders
Liz Rea [Tue, 17 Jan 2012 21:30:31 +0000 (15:30 -0600)]
Bug 6350 - Adding new developers to history.txt Jesse Maseto Connor Dewar Sam Sanders

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c7c892ae3408b8c5472d748dea8402966f51a8c6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 7343 - Fix empty values in statistic 1 and 2 dropboxes in neworderempty
Alex Arnaud [Fri, 20 Jan 2012 09:02:16 +0000 (10:02 +0100)]
bug 7343 - Fix empty values in statistic 1 and 2 dropboxes in neworderempty

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested. Comments have been incorporated. Marked as Passed QA.

http://bugs.koha-community.org/show_bug.cgi?id=7342
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 37c446b7ac3fd658903e2901e1b0b3aa10597fe8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7098: Adds koha_url elements to sco.css.
Garry Collum [Fri, 20 Jan 2012 17:24:27 +0000 (12:24 -0500)]
Bug 7098: Adds koha_url elements to sco.css.

The 'Powered by Koha' link was not styled in self-cko.  The koha_url elements were missing from sco.css.  The elements within opac.css were copied and added to sco.css.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago6829 Follow up
Marcel de Rooy [Thu, 5 Jan 2012 13:45:06 +0000 (14:45 +0100)]
6829 Follow up

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Needed this second follow up to remove 952-0 from the display again, coming up after the first follow up.
Changed a second test in accordance with first follow up.
Removed a useless 10th loop to create a tab10XX that is not in the template.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6829 Follow up patch
Frédéric Demians [Tue, 27 Dec 2011 10:01:48 +0000 (11:01 +0100)]
Bug 6829 Follow up patch

To reproduce the bug:

- Open OPAC MARC View for a specific biblio record
- Fields which are affected to tab 0 are all hidden

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch fixes bug for 0xx fields in OPAC MARC view.
Note: the problem only exists for 0xx fields with real subfields,
control fields display correctly, fields like 040 only display
after patch was applied.
(cherry picked from commit 263e5724eb1c9f1e787474ec92403179496c03b4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6790: Remove unnecessary variable from getroutinglist return
Colin Campbell [Fri, 26 Aug 2011 15:17:11 +0000 (16:17 +0100)]
Bug 6790: Remove unnecessary variable from getroutinglist return

getroutinglist returns a count variable to indicate how many elements
are in the array. This is almost always a serious code smell. (We are
programming in a list manipulating language) The routine was executing
am unnecessary loop just to maintain that var.
Removed the variable from the routine and perldoc
refactored calls of the routine removed the c-style loops for
more idiomatic and maintainable for loops
renamed some opaquely named variables
removed a call to the routine where nothing was done with the data
moved some html out of the calling script and into the template

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d2c24f3bbff5c3ba96ce5ae8baa2313fabf786d5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7402 : Fixing the date formatting so links to the invoice page work
Chris Cormack [Wed, 4 Jan 2012 19:54:43 +0000 (08:54 +1300)]
Bug 7402 : Fixing the date formatting so links to the invoice page work

This depends on bug 929

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Uses the new TT plugin to display the date, while using iso format
to build a correct URL to the invoice page.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5473 follow-up : removed warn & replace some tabs by 4 spaces
Paul Poulain [Fri, 20 Jan 2012 15:30:48 +0000 (16:30 +0100)]
Bug 5473 follow-up : removed warn & replace some tabs by 4 spaces
(cherry picked from commit f961638465cf1fc41b15a6c277e3c936ec02ab6e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug_5473: Update items when receiving shipments
Srdjan Jankovic [Tue, 20 Dec 2011 01:56:51 +0000 (14:56 +1300)]
bug_5473: Update items when receiving shipments

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Tested by recieving multiple items with the AcqCreateItem
preference set to 'placing and order' and 'receiving an item'
In both cases the pricing and vendor is brought over to the
item record so I'm signing off.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6694: Problem with casAuthentication syspref
Julian Maurice [Wed, 10 Aug 2011 09:41:06 +0000 (11:41 +0200)]
Bug 6694: Problem with casAuthentication syspref

A missing test in checkauth caused anonymous session to be destroyed and
re-created at every call when this syspref was set.
Almost the same issue is also fixed in check_api_auth, which caused
C4::Service->init to fail.

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8ffbf4e88c6ed98ad697bb4a2b4d9d1456d2c84c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBZ6115: Acquisition reports : date filter & sorting don't work
Paul Poulain [Fri, 22 Jul 2011 08:24:26 +0000 (10:24 +0200)]
BZ6115: Acquisition reports : date filter & sorting don't work

* the filter on dates don't work
* when displaying by day or month, it was 100% alphabetic, april was before
january for example. Adding the month number before the month name to get
proper sorting
* removed many commented warn & lines

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ceb5757573ada0dd7d5643e48dd36ed98b3f46de)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoOlivier Crouzet is 168th !
Paul Poulain [Thu, 19 Jan 2012 16:02:43 +0000 (17:02 +0100)]
Olivier Crouzet is 168th !
(cherry picked from commit b35233acbfb8125f2a2de5bea22f10ab7a6db25a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBZ4376 Minor change in GetMarcAuthor
Paul Poulain [Tue, 2 Aug 2011 14:54:38 +0000 (16:54 +0200)]
BZ4376 Minor change in GetMarcAuthor

A minor change in the GetMarcAuthors function of C4/Biblio.pm allow differentiate the type of authors in the templates

This change allow doing things like this in the templates:
<TMPL_IF EXPR="tag == 700" && code eq 'a' >
 <strong>Author:</strong>
<!-- TMPL_ELSE -->
 <TMPL_IF EXPR="tag == 710" && code eq 'a' >
  <strong>Corpotation Author:</strong>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->

(html template syntax, but also applicable to template toolkit)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Works as claimed and doesn't break existing functionality.
(cherry picked from commit b70e4f3d6d3ebca19c83a96de6770e572620c651)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 7083 - [SIGNED-OFF] Show creator name on list of public lists
Owen Leonard [Mon, 24 Oct 2011 15:18:16 +0000 (11:18 -0400)]
Fix for Bug 7083 - [SIGNED-OFF] Show creator name on list of public lists

Show the name of the patron who created each list on the list
of public lists. Also:

- correcting unescaped ampersand in the template
- making conditional a check on a variable that doesn't always
  exist, causing noisy errors in the log

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
After applying the patch a column for "Created by" is added to the display of
public lists, and the errors in the log are silenced. On the "Your lists"
tab, the link on the list name now has an escaped ampersand.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoUpdating Version Number to 3.06.03.000
Chris Nighswonger [Fri, 27 Jan 2012 14:14:57 +0000 (09:14 -0500)]
Updating Version Number to 3.06.03.000

12 years agoRelease Notes for 3.06.03.000 26 Jan 2012 15:06:56 Z v3.06.03
Chris Nighswonger [Thu, 26 Jan 2012 15:06:56 +0000 (10:06 -0500)]
Release Notes for 3.06.03.000 26 Jan 2012 15:06:56 Z

12 years agoVersion 3.6.3 Strings Update
Frédéric Demians [Thu, 26 Jan 2012 06:16:21 +0000 (07:16 +0100)]
Version 3.6.3 Strings Update
(cherry picked from commit bbf0f71d59f14ef78a32ef191c62e7e5b2c333ef)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoRevert "Bug 7266: flags debarred, suspended, gonenoaddress in overdue"
Chris Nighswonger [Wed, 18 Jan 2012 16:08:58 +0000 (11:08 -0500)]
Revert "Bug 7266: flags debarred, suspended, gonenoaddress in overdue"

This reverts commit 057b4ae129d460bd18fb81cf2685a29c2ab73d0b.

Reverting this commit from 3.6.x as it is dependent upon 6328

12 years agoRelease Notes for 3.06.03.000 18 Jan 2012 14:25:43 Z
Chris Nighswonger [Wed, 18 Jan 2012 14:27:44 +0000 (09:27 -0500)]
Release Notes for 3.06.03.000 18 Jan 2012 14:25:43 Z

12 years agoBug 7439 Follow up for mailmap
Marcel de Rooy [Fri, 13 Jan 2012 13:40:51 +0000 (14:40 +0100)]
Bug 7439 Follow up for mailmap

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7439: Add mailmap for jcamins
Jared Camins-Esakov [Thu, 12 Jan 2012 14:33:57 +0000 (09:33 -0500)]
Bug 7439: Add mailmap for jcamins

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7435: corrects Fund selectbox in addneworder
Adrien Saurat [Wed, 11 Jan 2012 15:28:02 +0000 (16:28 +0100)]
Bug 7435: corrects Fund selectbox in addneworder

Prevent disabled funds to appear in the Fund
select box.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 04400d992619741eb65de5f4976ccb0cdf7ae1a0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7276 : Follow up, adding a sub to clear the cache
Chris Cormack [Tue, 6 Dec 2011 22:07:23 +0000 (11:07 +1300)]
Bug 7276 : Follow up, adding a sub to clear the cache

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7276 : member entry Performance improvement
Henri-Damien LAURENT [Tue, 29 Nov 2011 09:57:14 +0000 (10:57 +0100)]
Bug 7276 : member entry Performance improvement

Before this patch : 9619 borrowers added in 31 Minutes, After : 68 seconds.
This adds Hashref to table structure in C4::SQLHelper to speed up bulk edits.

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6c38cc23d95b63ae069f7cac2f7d8d97f9c941ae)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6885 Follow up patch, invert tested condition
Frédéric Demians [Wed, 4 Jan 2012 17:09:34 +0000 (18:09 +0100)]
Bug 6885 Follow up patch, invert tested condition

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Not sure the brackets are nessecary, but I think I remember learning
bitwise operators have a lower priority than other relational
operators so wanted to make sure we notted the result of the bitwise
and, not the flag

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7266: flags debarred, suspended, gonenoaddress in overdue
Adrien Saurat [Tue, 20 Dec 2011 08:33:47 +0000 (09:33 +0100)]
Bug 7266: flags debarred, suspended, gonenoaddress in overdue

This patch makes these flags functionnal.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 74984f5cf3f12fe96e6d4201016efd9ca582e8b6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7097: HidePatronName not hiding on issue history
Ian Walls [Thu, 5 Jan 2012 18:17:53 +0000 (13:17 -0500)]
Bug 7097: HidePatronName not hiding on issue history

HidePatronName wasn't being respected on a titles Checkout History tab.  This patch
exports the preference to the template (if set), and then toggles the display between
patron cardnumber (if 'on') or the name (if 'off')

To test:

Enable HidePatronName
Go to the Checkout History tab of an item that has been checked out before
You should see the patron's cardnumber instead of their surname, firstname

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7332: Translated title (MARC21 242) not shown
Jared Camins-Esakov [Thu, 8 Dec 2011 14:18:37 +0000 (09:18 -0500)]
Bug 7332: Translated title (MARC21 242) not shown

The cataloger-supplied translated title stored in MARC21 field 242 was not being
displayed when XSLT was enabled.

Test plan:
1) Enable XSLT for OPAC Details and Results, and Intranet Details.
2) Create or add a record with a 242 field
3) See that the translated title is not displayed in OPAC Details or Results, or
Intranet Details
4) Apply patch
5) See that the translated title is now displayed in OPAC Details and Results,
and Intranet Details

Signed-off-by: Duncan Tyler <duncan@duncan-SoT.wgtn.cat-it.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 9156de6384cf2ca0a04f2df7697b0c672781166c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6787 - Fast Add framework for NORMARC
Magnus Enger [Tue, 27 Dec 2011 21:49:33 +0000 (22:49 +0100)]
Bug 6787 - Fast Add framework for NORMARC

The new framework will be called "Hurtigkatalogisering".

To test:
- Make sure the nb-NO translation is installed
- Run through the web installer on an empty database
- Select nb-NO as the installation language
- Select NORMARC as the marcflavour
- Include normarc_fastadd_framework in the installed data
- Check that the framework looks ok in:
-- More > Cataloguing
-- More > Administration > MARC framework

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, not problems found.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7277: Fixes display of subtitles in opac.
Garry Collum [Sun, 15 Jan 2012 22:00:12 +0000 (17:00 -0500)]
Bug 7277: Fixes display of subtitles in opac.

Adds comma and space to results display in opac between title and subtitles.
Also removes extra space before the subtitle in the results display of the staff pac.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 4300: Fix display of textual holdings (866)
Katrin Fischer [Mon, 16 Jan 2012 22:05:42 +0000 (23:05 +0100)]
Bug 4300: Fix display of textual holdings (866)

Fixed problems:
- only $z, but not $a was shown
- only first $z for each 866 field was shown
- each 866 field produced a ; even if no $z was present

After patch was applied:
- OPAC displays 866 $a and $z, separating each field with ;
- Staff displays 866 $a, $x and $z, separating each field with ;

Example(s) for testing:
866 $a1-86 (1941-1987)$xbound in 2 v. per year$zSome issues missing
866 $a1-86 (1941-1987)
866 $a--86 (1941-1897)$xinternal note
866 $zfirst note,$zsecond note

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7247 - rebuild_zebra.pl -v should show all Zebra log output
Dobrica Pavlinusic [Sat, 19 Nov 2011 10:49:53 +0000 (11:49 +0100)]
Bug 7247 - rebuild_zebra.pl -v should show all Zebra log output

Currently, -v option resets Zebra log output to default system values.

This produce amount of log specified in system defaults which is usually
too low for debugging.

This change explicitly forces all Zebra log output which create much more
chatter so it triggers with verbosity level 2

Test scenario:
1. pick koha site to reindex
2. use -v -v options to rebuild_zebra.pl to see additional output

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Verified help corrections and  loglevel 2 output vs. loglevel 1 output. No issues found.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>