Srdjan Jankovic [Wed, 8 Feb 2012 02:12:05 +0000 (15:12 +1300)]
bug_7458: A call number plugin
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
A library using an inhouse callnumbering system wants to be able to generate the next available call number not already in use. This custom call number plugin returns the next callnumber not already in use once a correct prefix has been entered. The prefixes are four to six letters, space, then one or two numbers.
(cherry picked from commit ecc1e94f35491ba392aa3bfd17118c55fa14e55b)
Robin Sheat [Fri, 10 Feb 2012 03:10:28 +0000 (16:10 +1300)]
Bug 7409 - add unzip and perl-doc dependencies to package
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 4e8cd9a9ddd3c76745a5102498d8836457173db5)
Bug 7312: Adds ISSN to serials/subscription-bib-search.pl results
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 91d0475a9b43dc3fbe6b373dc8dacd5db4bca9df)
Paul Poulain [Wed, 1 Feb 2012 14:15:02 +0000 (15:15 +0100)]
Bug 7246 add offset/length and where options to rebuild_zebra
This patch reimplement a feature that is on biblibre/master for Koha-community/master
It adds 4 parameters:
* offset = the offset of record. Say 1000 to start rebuilding at the 1000th record of your database
* length = how many records to export. Say 400 to export only 400 records
* where = add a where clause to rebuild only a given itemtype, or anything you want to filter on
Another improvement resulting from offset & length limit is the rebuild_zebra_sliced.zsh
that will be submitted in another patch.
rebuild_zebra_sliced will slice your all database in small chunks, and, if something went wrong for a given slice, will slice the slice, and repeat, until you reach a slice size of 1, showing which record is wrong in your database.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Removed mention of -l option for limiting number of items exported, as requested
by QA manager. This can be re-added in a later patch.
Srdjan Jankovic [Thu, 9 Feb 2012 00:24:35 +0000 (13:24 +1300)]
bug_7201: Holds reports: add copynumber and enumchron
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Data is there and correct - very helpful patch, thanks!
passes prove t xt t/db_dependent in line with current master failures.
Garry Collum [Wed, 18 Jan 2012 01:28:55 +0000 (20:28 -0500)]
Bug 7203: Fixes typo - 'Mange' to 'Manage' in several files.
Found 3 instances of the typo while looking for the typo reference in Bug 7203.
Fixed labels/label-edit-batch.tt, labels/label-edit-layout.tt, and patroncards/edit-layout.tt.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6a60642a9dbe3103854dc1edfe68a4765e3c03f8)
Garry Collum [Fri, 20 Jan 2012 16:23:04 +0000 (11:23 -0500)]
Bug 7114: Fixes the Funds' page display after the Filter link is clicked.
On the funds page there is a Fund Filters form and a menu underneath this form. When the form is hidden the contents of the page shift to the left overlapping the menu. The menu underneath the fund filters form must have been a later edition. This patch removes the line of javascript that shifts the contents of the page after the form is hidden.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch fixes the broken Layout when clicking on 'Filters'.
I am a bit confused by the link. I think it should toggle between different descriptions and
perhaps even hide all of the left navigation. This way the funds table would get more
room for display.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 3fcdd902f8fcd6d64fba8f434ae811d8e1a04fdd)
Magnus Enger [Fri, 3 Feb 2012 08:57:32 +0000 (09:57 +0100)]
Bug 7489 - Implement DisplayOPACiconsXSLT for NORMARC XSLT
This patch actually hides the whole line that contains the icon in the result
list, including "literary form" and "audience", but this is how the syspref
works for MARC21 too, so I'm sticking with that.
To test:
- Set marcflavour = NORMARC
- Set OPACXSLTResultsDisplay = on
- Set DisplayOPACiconsXSLT = show
- Check that icons and information about "Type", "Litterær form" and
"Målgruppe" are displayed in results, "Type" and the icon in detail
- Set DisplayOPACiconsXSLT = don't show
- Check that icons and information is not displayed in result or detail
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan worked nicely. Patch works as advertised.
Katrin Fischer [Fri, 10 Feb 2012 06:17:33 +0000 (07:17 +0100)]
Bug 7521: Templates should use receive_serials permission
Corrects templates to use permission receive_serials.
Before patch:
1) Serial receive page (/cgi-bin/koha/serials/serials-edit.pl...)
can only be accessed with full serials permissions.
When one permission is missing, page can not be accessed.
2) Serial collection/Issue History page (/cgi-bin/koha/serials/serials-collection.pl...)
can only be accessed with full serials permissions.
After applying patch:
1) Serial receive page can only be accessed when user has receive_serials
permission.
2) Edit and serial receive links are hidden, when user doesn't have
serials_receive permission. Page is accessible with at least 1 serials
permission.
I will send a another patch to correct behaviour for the routing permission.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d9d364516b0bd5363c95b134520bb0379836be51)
Chris Cormack [Thu, 16 Feb 2012 20:23:53 +0000 (09:23 +1300)]
Bug 7551 : Can only renew for the user you are logged in as now
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 497f49d8b69e0be9e192b48bf40f2f5ab6cc92ce)
Liz Rea [Wed, 15 Feb 2012 20:13:49 +0000 (14:13 -0600)]
Bug 7546 - cannot view subscription detail
This patch adds a C4::Search to subscription-detail.pl to compensate for a removed
one from auth.pm during the denesting effort.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Bug 7546 Do not call routine as bareword
Fixes compilation errors due to calling routine without parens
Also nothing was gained (and obfuscation added) by forcing
the return into a hash ref have changed variable to hash
tidied up the if else chain
These routines should be refactored out future
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
bug 7546 follow-up, enabled_staff_search_views problem
* enabled_staff_search_views was not exported by C4::Search, should have been
* serials/serials-edit.pl were also missing it
Comments:
* checked with for file in */*.pl; do perl -wc $file; done that no script was still having this problem
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Final sign off for all 3 patches
Note: I had some problems with tests, but it is probably related to my data and not this patch.
(cherry picked from commit 1ddc9322dfc13ef7f1e930692bfd2cb3771b102b)
Marcel de Rooy [Thu, 19 Jan 2012 08:50:03 +0000 (09:50 +0100)]
Bug 3264 UnCloneField() / minus button in MARC editor can clear all subfields (authorities AND biblio)
All subfields following the removed subfield were not saved.
Problem is in C4/Biblio routine TransformHtmlToMarc.
If the field is emptied, the param list contains a code param but no subfield
param. The while loop handling the subfields could not handle that. Also added
a FIXME because the whole routine depends on an assumption about the order of
cgi parameters that is not strictly guaranteed.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
I was unable to replicate the problem, but can confirm that the patch does
not break anything under any of the following platforms/browsers:
Mac OS X 10.6.8:
Chrome 16.0.912.77
Firefox 9.0.1
Windows 7:
Firefox 3.6.3
Firefox 9.0.1
IE 8.0.7600.16385
Kyle M Hall [Wed, 8 Feb 2012 15:45:53 +0000 (10:45 -0500)]
Bug 7018 - need all acq permissions to search
Single line fix. Changes permissions required for histsearch.pl
from requiring * for acquisitions to only requiring
group_manage, order_manage, and order_receive
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0d037efd358c5516466c5df99e565d5fd98d5a74)
Robin Sheat [Thu, 9 Feb 2012 23:55:09 +0000 (12:55 +1300)]
Bug 7238 - make packages deal with SIP config
This moves the SIP config to the templates directory (on package
building) in anticipation of making it configurable with package tools.
Prevents it being installed into /etc.
Previous and next functions are not used, since this code was removed from mas_subfields_structure.pl
http://bugs.koha-community.org/show_bug.cgi?id=6924 Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2d67771157e9c07f5e907fc6507bbd9fabb3b82c)
Paul Poulain [Fri, 16 Sep 2011 16:02:58 +0000 (18:02 +0200)]
Bug 6875 de-nesting Auth.pm
* removed use C4::Koha that is useless
* moved "use C4::Members" to "require C4::Members" just before GetMemberDetails call. This will avoid loading C4::Member everytime a page is called by someone not logged
* still to do = work on C4::VirtualShelves, that can be optimized, definetly !
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on latest master, 28 Jan 2012
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Please WAIT with virtual shelves. Working on that..
Tested and marked as Passed QA.
(cherry picked from commit e780e0669c8b2d2a50a7996ab76e584c4cd4c59d)
Paul Poulain [Fri, 16 Sep 2011 19:58:30 +0000 (21:58 +0200)]
Bug 6875 de-nesting C4::VirtualShelves
* C4::Circulation is unused, removing it
* C4::Members used only in ShelfPossibleAction, switching from use to require
* C4::Auth used only in RefreshShelvesSummary, a sub called only in
opac-addbybiblionumber.pl script, moving the require inside the sub
Paul Poulain [Fri, 16 Sep 2011 17:38:06 +0000 (19:38 +0200)]
Bug 6875 de-nesting C4::Heading
C4::Search is needed only in authorities sub, moving it here and switching to
require
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Corrected call to SimpleSearch in both subs where it is used. Additional
performance improvements are included in bug 7284. 28 Jan 2012
(cherry picked from commit 58c46b27af601a893e1eabdfb5bd7d4d0d887f24)
Paul Poulain [Fri, 16 Sep 2011 16:48:15 +0000 (18:48 +0200)]
Bug 6875 de-nesting C4/Serials
* use C4::Branch is loaded only to call GetBranchNAme in PrepareSerialsData
and set branchname in the hashresult. This sub PrepareSerialsData is used
in the following scripts :
opac/opac-serial-issues.pl: my $subscriptioninformation=PrepareSerialsData($subscriptions); => no use of branchname after
serials/serials-collection.pl: $subscriptions=PrepareSerialsData(\@subscriptioninformation); => no use of branchname after
=> we can remove the ->{branchname} from the result, and remove the C4::Branch dependancy
* moves use C4::Items to require C4::Items, to call AddItemFromMarc, when
receiving a serial, with Recieving create an item set in the subscription.
* removed use C4::Letters and C4::Search, that are useless
Paul Poulain [Fri, 16 Sep 2011 16:28:00 +0000 (18:28 +0200)]
Bug 6875 de-nesting C4::Koha.pm
* removed use C4::Output, that was not used
* moved use URI::split to getitemtypeimagelocation and switched to "require".
Checked it still works through admin/itemtype.pl
* moved use Business::ISBN to _isbn_cleanup.pl and switched to "require".
Checked it still works with the following small script :
use C4::Koha;
print GetNormalizedISBN("1-56592-257-3");
Chris Cormack [Thu, 2 Feb 2012 23:44:17 +0000 (12:44 +1300)]
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 efd26a44d5640555f7c1a97e782e3661af7d77f0)
Owen Leonard [Tue, 11 Oct 2011 18:52:19 +0000 (14:52 -0400)]
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: 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 1142b189f29808bae6f7f099f692b902795ab94b)
Frédéric Demians [Mon, 30 Jan 2012 18:14:04 +0000 (19:14 +0100)]
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 147a3f8b970450c97a41a4ef60f56c5f77748564)
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 211a10c83ab36af3c299b05cd74864e6801bd072)
Julian Maurice [Fri, 2 Sep 2011 14:30:18 +0000 (16:30 +0200)]
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 2916ddae4ad32886831004d8efe373a62eda198e)
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 6378436089134f1d9b8015e991fcb81c7d8ead7c)
Paul Poulain [Fri, 10 Feb 2012 08:45:34 +0000 (09:45 +0100)]
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.
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 44fd379dc23fb4423619ab07e5f4a4906c097a6c)
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.
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 78f2ac28626196950891dc562714f8d463f5f9bd)
Duncan Tyler [Tue, 20 Dec 2011 00:37:18 +0000 (13:37 +1300)]
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 3317d16029fc230ed51d987bc412b9d89463596f)
http://bugs.koha-community.org/show_bug.cgi?id=7502 Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c1e47b9359a77b6812173b7b23934bbc154a88e4)
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)
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)
- 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)
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.
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.
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)
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.
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)
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)
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)
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)
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)
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.
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)
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)
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)
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)
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)
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)
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)
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)
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)
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: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit e824f847b9a002dec24b48f076ce2b7d4a9dd5d5)
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)
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.
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: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit fe1a642a1a06c38b55c2666ead4f4ff4ea3658da)
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)
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)
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)
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.
projects / koha.git / log