This test validate Template Toolkit (TT) Koha files.
For the time being an unique validation is done: Test if TT files
contain TT directive within HTML tag. For example:
<li[% IF
This kind of constuction MUST be avoided because it break Koha
translation process.
This patch transform also translation specific modules into C4 modules
in order to be able to use them in test case:
C4::TTPaser
C4::TmplToken
C4::TmplTokenType
This patch is a Perl adaptation of a Haskell script from Frère Sébastien
Marie.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Notes on testing:
- translate install de-DE - worked ok
- translate update de-DE > translate install de-DE - worked ok
- running the test xt/tt_valid.t - worked ok and pointed out lots of problems.
Found no problems.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a41100a44519373efafb5c9f3cdc5607657d651e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Wed, 8 Jun 2011 03:10:09 +0000 (15:10 +1200)]
Bug 6482 - allow the mysql details to be changed during koha-create
This allows the database details (username and database name in
particular) to be modified in between a koha-create --request-db and
--populate-db. Most useful when you discover that the username is too
long or something. Now, when populating the database, the connection
information is reloaded from the koha-conf.xml rather than being
generated from the instance name.
preprod34 [Fri, 12 Aug 2011 13:44:51 +0000 (09:44 -0400)]
Bug 6714 : Removed the "en" in some paths of opac.css
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e0eacd664c5f8c662fc22f2503530f1dc4f5f0a5)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 17 Aug 2011 19:40:39 +0000 (15:40 -0400)]
Fix for Bug 6743 - displayFacetCount not working
T:T variable scope error.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit db44c217b22e88dd4ee88cc9c15ddcf928fe3d4e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Wed, 3 Aug 2011 09:29:01 +0000 (11:29 +0200)]
bug_4002: issues referential integrity
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d0c9592592c0bd6c529915a9fbc04476f9b52851)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Julian Maurice [Mon, 4 Apr 2011 14:52:03 +0000 (16:52 +0200)]
Bug 5098: Add csv headers in overdues
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a3e55473555ee4b3a3dd4af81f1b163519278775)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Brice Sanchez [Tue, 8 Feb 2011 18:01:46 +0000 (13:01 -0500)]
Bug 5713 :debug calculation when fines are reversed then re-payed
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I could not reproduce the calculation bug, but after
applying this patch multiple pay/reverse cycles only
are still only 2 lines in accountlines, which makes the
display a lot less confusing. Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5b945d8c415aa610e4ded830825f43bd8592d109)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
When adding a patron who is a child, the default library is not set when defining a guarantor, this patch corrects the problem.
More, for children with no guarantors, the default branch is the editing branch.
BibLibre MT5795
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 36f526a9a8dab77259b35f5ab4697575d9a10f44)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Mon, 25 Apr 2011 22:30:22 +0000 (18:30 -0400)]
Bug 6259: AllowHoldPolicyOverride causes every hold to need override
Adds a check to make sure that the item is actually unavailable before requiring the override
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6059599fac4cfd0b12af48348a6d349974205697)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Wed, 27 Jul 2011 02:11:42 +0000 (22:11 -0400)]
Bugs 6634: manager_id not recorded for payments and rental charges
Manager_id, the borrowernumber of the staff person doing the action, was not recorded
for payments, rental charges, or rental charges on renewals. This patch implements that.
This patch also adds the recording of itemnumber in a payment, by taking the itemnumber of
the account that it's paying off. This addresses bug 2696, though it does not make any
change to the display logic of the Payments line in the staff client.
To test:
1. Check out an item with an issuing charge
2. Renew the item
3. Pay one of the rental charges on the item
4. Verify in koha.accountlines that each of the three above operations recorded your borrowernumber
in accountlines.manager_id
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 18c491542bd6e4dfd580ea3913a394fbdb8acd5a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6690: If multiple issues are received in serials-edit.pl, changing the status of any issue changes the date of the first issue.
If multiple issues are in the list, changing the status of any issue in
the table would always change the "Expected on" date of the first issue.
Modified the javascript so the date is modified on the correct row.
Reimplementation of Patch for 3.4.x
Patch for 3.2.x from Frédérick Capovilla
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Sophie Meynieux [Fri, 8 Apr 2011 10:12:09 +0000 (12:12 +0200)]
Bug #6139 Automatic incrementation of call number does not work if prefix contains '
This patch also fixes giving the first callnumber with a given prefix.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1d0c85a4a865caf82e69919b2110382be8c4539b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Colin Campbell [Wed, 13 Apr 2011 16:21:47 +0000 (17:21 +0100)]
Bug 6181: Remove CGI Scolling lists from C4::Budgets
As noted on bug 766 more cases of usage of
CGI::scrolling_list were imported into C4::Budgets
Even if we were not trying to remove usage of this
the C4 modules are not the place to generate markup
Most of these routines are noise as they are not used in
any current code but cause confusion and increase
maintenance overhead. They are removed
The sort dropboxes on order create are the only
references in current templates to these routines
they have been replaced by a select list generated
by the markup.
They can probably be removed too but their existence
although the option that causes them to be displayed
seems unlikely to be set. I've left them pending
resolution of some of the inconsistencies and
confusions surrounding Budgts
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1a03a8a38eb07b9bf55e3e2afeb4f2cb4e954f66)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 5 May 2011 13:32:06 +0000 (09:32 -0400)]
Fix for Bug 6309, subscription table sorter in the opac
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit b7985fb04f9772c5134a5b5fa0be812a3e43624f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Thu, 21 Jul 2011 14:48:33 +0000 (10:48 -0400)]
Bug 2629: add char-with-stroke support to word-phrase-utf.chr
This patch adds diacritic search support for the following characters-with-stroke:
a,b,c,d,e,h,l,r,t,u,y,z
Handles both uppercase and lowercase mappings.
Also corrects a note in word-phrase-utf.chr: the 'equivalent' command is NOT for searching,
but rather for sorting. See Zebra manual: http://www.indexdata.com/zebra/doc/character-map-files.html,
near the bottom.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Some notes:
- Copied the file to my koha-dev folder and reindexed
- Tried some simple searches like: Süden and Suden, schon und schön with success
- Added some of the new characters to a record and tried search with and
without diacritics (ɨƗʉⱥɆɌ and iiuaer) with success.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit eda85ccc2afd136d34da89dc242b8cbcf2c8cc3b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Thu, 4 Aug 2011 15:21:01 +0000 (11:21 -0400)]
Bug 6476: Baker & Taylor Content Cafe link not showing
Another T:T issue. Patch replaces 'BakerTaylorContenturl' with 'BakerTaylorContentURL'
universally in all occurences in the templates (only opac-detail.tt)
Katrin Fischer [Fri, 5 Aug 2011 11:28:27 +0000 (13:28 +0200)]
Bug 6692: Small template change: Set > Set library
Changes the link to change the library from 'Set' to 'Set library'
in the grey toolbar in staff.
(cherry picked from commit 3e0d7bc7e5efe8403f686f9a0e80394120078d8e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
bug 6702 update typo in BiblioAddsAuthorities preference
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: MJ Ray <mjr@phonecoop.coop> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a66ae182f8e7c3f207f31477e8a8733a75a52f53)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Mon, 25 Jul 2011 02:16:30 +0000 (14:16 +1200)]
Bug 6626 - add sudo as a package dependency
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 66c3b1507a252140b5779f5f46f9fc9590d5d981)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6150 UNIMARC field 225 plugin: allow $a value data entry
The current UNIMARC 225 plugin behavior forces cataloguer to select a
collection name in a combo box. The content of this combo box comes from
special EDITORS authorities list which is constructed by a script. So
there is no way to add a new collection directly in biblio data entry
form.
A input box can be added to the plugin form in order to enter by hand a
new collection.
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a7dd94769f0af0e9cfcfd3b78549fa532e326756)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
5663: Show control number without organization code in staff URLs
Intranet detail xsl adjusted at 4 places: 773 when leader19=c, 775, 780, 785.
Enable the pref UseControlNumber when testing this patch. And set pref XSLTDetailsDisplay to using XSLT stylesheets.
Test by adding a control number ($w) in abovementioned fields.
Go to staff detail and check if the links work.
Add some orgcode between parentheses or brackets in front of the control number.
Test again in staff detail if the links still work.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fc84823b812157cde08c56b2fad90d2dbf5f64e4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole C. Engard [Wed, 10 Aug 2011 00:34:08 +0000 (20:34 -0400)]
bug 6701 - change timeout to say milliseconds
Signed-off-by: MJ Ray <mjr@phonecoop.coop> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit be38a33f5b5a214ebcde528e45bd66c653fc36c5)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit da7bcbd4e6e0a519a4edca3aef536d24df56c1be)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6461 - BiblioDefaultView has no impact on how record are displayed when going from results list
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9dafa2aadacd74868bcd01fcf431c2ecaa1a262e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 039872a45849cd7bebf99b3adfc0593e3f97e47f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6373 : Corrects a validation problem on addbiblio.pl on IE8
The mandatory fields popup didn't appear when some mandatory fields
weren't filled on IE8. Replacing the "focus" with its JQuery equivalent
corrected the problem.
[EDIT by Owen Leonard] Removed commented line
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Follow-up by owen, that he forgot to upload on bugzilla:
Signed-off patch includes one minor edit: I removed the commented-out line
which the jQuery line replaces. We have git to track changes for us, we don't
have to leave old code in.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 57da5e68f77c43ea11893e7ffda78b797b3f0ede)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6369 Correct a formatting problem in the pdf generation of basketgroup.pl
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 552cde08db9e237de631af7e3acc774154b265a2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 19 May 2011 19:11:56 +0000 (15:11 -0400)]
Fix for Bug 6346 - Patron search results should be valigned top
I'm going for the nuclear option: Let's valign-top all table cells.
Having vertical-align : middle really only works well if your
table cells have the same height.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7d2839dbd6ea15243c5f41a36a4078d0ca02f7c9)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 4959 (Language inconsistencies on basket groups; skip confirmation when closing basket)
This patch adds a new pref BasketConfirmations. This adds the option to skip
confirmations on closing and reopening a basket. If you skip the confirmation,
you do not create a new basket group.
The confusing line Create a purchase order (when closing a basket) is replaced
by Attach basket to a new basket group with the same name.
A warning for a null value on basketgroupid is fixed.
Rebased April 11.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f53dcce0adb9d60e19dfa32a3421508356744746)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Colin Campbell [Thu, 28 Apr 2011 13:39:45 +0000 (14:39 +0100)]
Bug 6280 : Don't generate invalid SQL in GetPendingIssues
Change to parameter list in GetPendingIssues made it
callable by an empty list resulting in invalid sql being
sent to server. As this was occuring on most issues error log
was filling up. Put safeguard in the routine
Also don't bother calling when you have no need
Some of the processing was needlessly obscure
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c435c8c7d13110ab72efdf2877d3fc80f5487e72)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 8 Aug 2011 16:58:51 +0000 (12:58 -0400)]
Fix for Bug 6260 - Missing space in availability information of OPAC XSLT results
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6a1b7a3321c28534579ac889c9ebf08aa13335c6)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6235 : Corrects the behaviour of the humanmsg box on IE8 and IE7.
Without this fix, the black box that appears when you save system
preferences doesn't disappear on IE.
Fix from http://code.google.com/p/humanmsg/issues/detail?id=1
(Thanks Owen Leonard)
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 661bcfadbdca6d6d6c1cdb8ba9c398e6c0b45b8f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6144 - Cant hide constraints when showed at subfield edition
Reformatted for Template::Toolkit
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 75ce3b73fa2c12680eb114276ca8a3c399991abb)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Sophie Meynieux [Mon, 28 Feb 2011 15:25:23 +0000 (16:25 +0100)]
Bug 6078: Request to find borrowers without issues overload the server
Optimization of the SQL request using NOT EXISTS instead of NOT IN
BibLibre MT5946
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e1370001c65ca75d44497896fe6f47c716a62f26)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Jane Wagner [Fri, 1 Apr 2011 14:28:04 +0000 (10:28 -0400)]
Bug 6034 - Shelving cart feature can wipe permanent shelving location in certain circumstances
Bugfix for problems when shelving cart used without In Processing settings
To test, with InProcessingToShelvingCart off, NewItemsDefaultLocation blank,
and ReturnToShelvingCart on, create a new item. Check the contents of the
location and permanent_location fields in its item record -- the same value
should be in both. Then run the item through checkin, and look at those fields
again. The location field should now be set to CART while permanent_location
should still have the original value. After the cart_to_shelf cron job runs
with the proper timing, check the item record again. Both location and
permanent_location should again be identical.
Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2bb9904ab3379812e75c0fb5681e43ea530046af)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 7 Jul 2011 16:46:58 +0000 (12:46 -0400)]
Fix for Bug 6534 - Duplicate opac renew buttons at the top of the checkouts list
This patch uses JS to add two links to the top of the checkouts
table: renew selected and renew all. Clicking each one submits
the respective form.
Also added is a small validation routine to warn the user if
they try to "renew selected" without having checked any boxes.
Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7093f075a77b0c33545466301fc58ad02808ae1b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
5660 Webinstaller should check if KohaOpacLanguage exists in staff
Rebased on April 27 for master (3.05.00.001).
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signing off on the whitespace changes made by Paul
Liz Rea [Thu, 23 Jun 2011 14:49:19 +0000 (09:49 -0500)]
Bug 6527 - Table striping not working on cataloguing search
Resolves TT issue causing the results list in cataloguing search (addbooks.pl) to not be
striped.
To test:
More -> Cataloging
do a search
Without patch:
results will not alternate striping as originally intended.
With patch:
Results will be alternating white/grey.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit 68a3b6cd90704b7dc75741a55798de0b60bbfa3e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2c88e1e0f8b9422121edd30ff54494085eaf87eb)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Thu, 29 Jul 2010 04:10:52 +0000 (16:10 +1200)]
Bug 5072 - prevent creating new orders if there are no valid budgets
On the basket editing screen, the links to add orders to a basket are
hidden unless a valid fund is available.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4833fd83998e3b4d95c7db4905eaddda28012976)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Mon, 1 Aug 2011 21:49:59 +0000 (09:49 +1200)]
Bug 5072 : Template changes
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 5b05ab8bf1592d1a9ca2127b6053b6c7684c4328)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
MJ Ray [Sun, 19 Jun 2011 16:51:53 +0000 (17:51 +0100)]
Bug 5468: removin apt-get-debian-lenny and updating INSTALL.debian
install_misc/apt-get-debian-lenny.sh: obsolete, causing problems and a questionable practice, so deleted INSTALL.debian: updated to use debian.packages instead and cite more related docs
Amended following feedback comment #6 from Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a9d24af4700b9b1e384be6406987b43b80095e1c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 5131 :restrict use of sort_by value to allowed values
The user input for sort_by value was used without care, resulting the possibility for user to set any Template Variable to 1.
This patch restrict the values to sort field.
The list of allowd_sortby was taken from 'includes/resort_form.inc'.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 649573ad244b95e1b90df7d0925f31f735ae50f7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 5737: Modified the merge subroutine in AuthoritiesMarc.pm so it won't destroy the connection to the biblioserver.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit 94700d65c09fc920f30d2bd9763737065635e68a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 1 Aug 2011 03:05:09 +0000 (23:05 -0400)]
Fix for Bug 6635, Can't page through results in label batch
- Fixing T:T scope issue
- Correcting footer include for pop-up windows.
- Markup correction for validity.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit dd208da05a846bb12d693691b5e3edb51dfcf0ab)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Thu, 21 Jul 2011 05:32:09 +0000 (17:32 +1200)]
Bug 6540 - [SIGNED-OFF] fix some command-line args issues
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e7cf2223e06d9aea07f2dce6cd6481cbc2ae0d9d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Magnus Enger [Wed, 20 Jul 2011 17:01:19 +0000 (19:01 +0200)]
Bug 6540 - Add config file as command line option for koha-create
Order of precedence for config options, from lowest to highest:
1. The defaults set in koha-create itself
2. /etc/koha/koha-sites.conf
3. Config file specified with --configfile
4. Individual options set with --marcflavor, --zebralang, --defaultsql
Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b66c860d5df65c185279741219b88bc08e7de524)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Magnus Enger [Wed, 20 Jul 2011 14:08:51 +0000 (16:08 +0200)]
Bug 6540 - Add defaultsql command line option
This will override the setting in /etc/koha/koha-sites.conf.
Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bddca6fbcfaabd9a541c1c9e1c537c377c2b783f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Magnus Enger [Mon, 18 Jul 2011 13:35:27 +0000 (15:35 +0200)]
Bug 6540 - Followup patch adding command line options
This adds the --marcflavor and --zebralang commandline options, as
well as short versions of all options.
Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c7bde297188dfd5275f53c448c33f225a849ce9b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Magnus Enger [Sat, 16 Jul 2011 18:58:34 +0000 (20:58 +0200)]
Bug 6540 - Make ZEBRA_MARC_FORMAT and ZEBRA_LANGUAGE configurable for koha-create
Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b7b36796f57a87a02ec0ed0195cbf8ae22159e3e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Thu, 28 Jul 2011 21:03:25 +0000 (09:03 +1200)]
Bug 6642 : Making sure permissions are checked on label creator
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9d5d1f8f966baa56857987c2c741d735326ac11e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Colin Campbell [Thu, 5 May 2011 14:32:08 +0000 (15:32 +0100)]
Bug 6311 check_inst_id was being passed non-existent value
Due to a typo in the hash key check_inst_id in the
handle_end_patron_session was always logging an error
as the actual field contents were not being checked
unlike in other messages
Signed-off-by: Frederic Demains <frederic@tamil.fr> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e793b0dda64989e216f285a3bd56110565dd1831)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
5662: Show control number without organization code in OPAC URLs
OPAC detail xsl adjusted at four places: 773 when leader19=c, 775, 780, 785.
Enable the pref UseControlNumber when testing this patch. And set pref OPACXSLTDetailsDisplay to using XSLT stylesheets.
Test by adding a control number ($w) in abovementioned fields.
Go to opac detail and check if the links work.
Add some orgcode between parentheses or brackets in front of the control number.
Test again in opac detail if the links still work.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works with and without orgCode in front of $w now.
No change to current behaviour, but closer to MARC21 standard.
Katrin Fischer [Sun, 17 Jul 2011 20:43:31 +0000 (22:43 +0200)]
Bug 4433: Small display problem for topical subjects
This removes the subfield codes shown for topical subject authorities only.
To test:
- Add different authority records and at least one for a topical subject.
- Use search in intranet and opac (turn on opacauthorities) to serch for your subjects.
- All headings will show without the subfield codes (at least $a in front), except the
topical subject.
This patch removes the subfield codes for the topical headings.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Works as advertised in opac and staff. (July 18, 2011)
Colin Campbell [Thu, 14 Jul 2011 10:58:59 +0000 (06:58 -0400)]
Bug 6598 : ensure OPACFineRenewals can prevent opac renewals
patron_flagged was being passed at global scope to the template
but being checked as an element in other structures
Also although items could not be selected the Renew Selected
button was displayed, it too should check the flag
Amended the preference text which incorrectly suggested the
option could be turned off. (leading to the opposite to what
the user might expect)
In the script have explicitly assigned the value to a inumeric
variable rather than making an implicit conversion as it may be
that readers were missing that sleight of hand
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b84276a3b117e3ebf558fede1c1ac5ce059d484d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Sun, 17 Jul 2011 18:53:29 +0000 (20:53 +0200)]
Bug 4497: Make tabs for managing suggestions translatable
This patch makes the tabs on the manage suggestion page translatable.
To test:
- Create some suggestions in intranet or opac and manage them to make the
different status tabs appear: accecpted, pending, checked, rejected
- Apply patch, run 'perl translate update <languagecode>'
- Check po file for string '%s %sPending %sAccepted %sChecked %sRejected %sAvailable %sOrdered%s %s%s %sNo name%s (%s)'
- Translate it, save and run 'perl translate install <languagecode>'
Tabs should now appear translated.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4b2ea4cf447464e1a8cfc16605d1f21e72cdd41a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Mon, 18 Jul 2011 22:06:00 +0000 (18:06 -0400)]
BZ6412 : spaces in note
There was an improper T::T <input> construction: the note value contained spaces.
This patch fixes the problem by using a correct [% IF %] construction
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 83f6083f36550ae1b35e2ee13310deccb24fdc73)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 21 Jul 2011 15:44:32 +0000 (11:44 -0400)]
Additional change for bug 5922 - Show waiting items for patron on return
- Adding patron name to dialog
- Styling dialog as a message rather than an alert since it's
informational rather than a warning
(cherry picked from commit 53daf8a2de25ef4e9c51c8316c4ec5d7760c234f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Wed, 29 Jun 2011 20:54:30 +0000 (22:54 +0200)]
BZ5719: unimarc plugin fixes
* 010 now don't care of - or no - in the isbn
* 225a window now higher to have all buttons displayed
Signed-off-by: Sophie Meynieux <sophie.meynieux@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 83e42b02858016f8ff53af668953e48cd6750e72)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Sophie Meynieux [Tue, 7 Jun 2011 10:33:38 +0000 (12:33 +0200)]
Bug 6474 Barcode not incrementing properly in format HBYYMMINCR if HB contains -
Adding - to regexp for matching branch code. Wondering if other characters should not be added too.
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0ff16446a8f88d0e5302ada6322541e69acc816d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Alex Arnaud [Tue, 5 Apr 2011 12:10:19 +0000 (14:10 +0200)]
Bug #6057 - Improve finding next stock number
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 00354d93bbfc78a6dcc0bab17ab8ace368e25be4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
The previous patch broke the autoMemberNum feature by adding a line to fixup_cardnumber
that returned 'undef' for cardnumber in all usages of the subroutine (limited to members/memberentry.pl
and tools/import_borrowers.pl. This prevented the automatic number from being calculated in all cases.
This patch removes the offending line.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d119fbd91ceec78eb3a9caad209986cb4deeb4c2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Wed, 27 Jul 2011 21:01:02 +0000 (23:01 +0200)]
Bug 6080: Add id to total line in funds table
Alternate patch for bug 6080.
Instead of removing the line altogether make it possible to hide it
easily by adding an id.
To test:
- apply patch
- check your funds table for the last line labelled 'Total'
- add to IntranetUserCss: #funds_total {display:none;}
- check again, line should be hidden now
Reason:
The totals is only confusing for multi-level funds, but not wrong.
If you are using only 1 level of funds, it works all ok.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7fd4480167a7b14ebe734a7d0d6eda4212a9a2af)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
John Seymour [Fri, 22 Jul 2011 03:08:40 +0000 (15:08 +1200)]
Bug 4873 - Ensure that the required directories exist on init
As systems (Ubuntu already, Debian testing is doing it too) move to
ramdisking /var/run and /var/lock, or otherwise clearing them on boot,
we need to ensure that they're there when we need them. This patch
autocreates any directories that are missing when the init script runs.
Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fb347c97ac996a5d50559bee62b618ad0542b947)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Liz Rea <lrea@nekls.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1124bf682f9fa5cd0fd3319bdcd0dd168ae2e08b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Tue, 26 Jul 2011 18:22:53 +0000 (14:22 -0400)]
Bug 6614: Remove newlines from order notes when exporting to CSV
Newline is not a valid character to Text::CSV's combine() subroutine. If an order
contained a note with a newline in it, that line would come out as a blank entry in
the exported CSV. This patch strips such characters, globally.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 68f99cdf980222dcb557667925bd6024640cda2a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Wed, 20 Jul 2011 22:21:31 +0000 (10:21 +1200)]
Bug 6611 : With the change to making cardnumber a nullable field, we need to pass it around when we are updating borrowers, to make sure we don't null it
Tested with every small edit link on moremember.pl.
Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0dae6dca92bcf751168c4bcaee6b09a3bdc1e77f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 21 Jul 2011 14:30:28 +0000 (10:30 -0400)]
Fix for Bug 6622 - Remove closing style tag from staff-global.css
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9db5fa227f0053cb65c3928a60cd5fadb5cf1042)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 19 Jul 2011 09:05:13 +0000 (05:05 -0400)]
Fix for Bug 6612 - Sort pulldown for messages in alphabetical order
The values in the menu come straight out of GetAuthorisedValues(), which sorts
its results by "category, lib, lib_opac." Rather than trying to re-sort the
data in circulation.pl this patch changes the template to show 'lib,' the
description, instead of the authorised_value. That will make the output
match the column which is being sorted.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0699c8af84f7e3c13c0a48197b581a5375f4f039)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 7 Jul 2011 01:42:00 +0000 (21:42 -0400)]
Fix for Bug 6484 - due date sorter on 'my summary' missing
Columns on the summary table are shown or hidden based on a
variety of different settings, leading to convoluted if/else
template constructions if we want to define header sorting
in the <script> block. Using the jQuery Metadata plugin
allows us to specify sorting options as classes on the
table header. This adds a dependency but simplifies the
template markup significantly.
I recommend continuing to specify header sort options in the
<script> block in cases where it is relatively simple to do
so and saving inclusion of the additional jQuery plugin for
pages which really need it.
Other changes: Moved common sorter configuration detalis to
default declaration; Moved the date due column so that it
could be set as the default sort without taking into account
multiple disappearing columns (default sort cannot be set
in the markup for a <th>).
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 203de2452e2e8358a74b35a54d349d72382b5b3f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 19 Jul 2011 05:27:07 +0000 (01:27 -0400)]
Fix for Bug 6601 - dictionary items not adding to query
T:T variable scope error.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9d21892cec24c10c29e3587affeee8e800cb2ee8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 18 Jul 2011 17:03:32 +0000 (13:03 -0400)]
Fix for Bug 6599 - Don't show dictionary definition table if there are no definitions
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bd6404608ab36a7ba5a1031fb512d67c161975f8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 12 Jul 2011 20:01:41 +0000 (16:01 -0400)]
Fix for Bug 6578, serial items have misaligned columns in holdings table
It looks like a variable name got changed in the T:T transition.
This correction uses the H:T:P template for reference.
(cherry picked from commit c8c019e07f224d5200668e746c5babea005ec7da)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6503 - Variable $sth is declared 3 times (with keyword "my") in "makepayment" sub of "Accounts.pm"
In the code available today (14-Jun-2011), in Koha git's "master" branch,
the file "Accounts.pm" (in the "C4" directory) has the variable "$sth"
declared 3 times in the "makepayment" sub. This causes the following
warnings to appear when running "make test" in Koha installation, for
several tests:
t/Heading.t ......................... "my" variable $sth masks earlier declaration
in same scope at kohaclone/blib/PERL_MODULE_DIR/C4/Accounts.pm line 172.
"my" variable $sth masks earlier declaration in same scope at
kohaclone/blib/PERL_MODULE_DIR/C4/Accounts.pm line 188.
[...]
t/ILSDI_Services.t .................. "my" variable $sth masks earlier declaration
in same scope at kohaclone/blib/PERL_MODULE_DIR/C4/Accounts.pm line 172.
"my" variable $sth masks earlier declaration in same scope
at kohaclone/blib/PERL_MODULE_DIR/C4/Accounts.pm line 188.
[...etc...]
Therefore, I'm removing the "my" keyword from the declarations of "$sth"
in lines 172 and 188 of "Accounts.pm".
Bug 6480 - Koha produces a lot of apache logs for UNIMARC
For Koha with UNIMARC a lot of entries in apache log lines are produced.
In the patch, corrections to the GetCOinSBiblio function has been introduces,
in the UNIMARC section: (i.e. || '' at the end of lines that can create this
problem) -- analogous as it is in the MARC21 section.
Owen Leonard [Thu, 21 Jul 2011 03:17:10 +0000 (23:17 -0400)]
Follow-up fixes for Bug 5917, Switch Koha to use Template::Toolkit
While fixing Bug 6395 I found a few other instances of leftover
TMPL usage.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d8bf9e6a29da4d07c108be25aac26f35fb216b79)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Wed, 20 Jul 2011 15:41:12 +0000 (11:41 -0400)]
Bug 6613: CSV basket export columns misaligned
Removes 'line' heading, since it does not correspond to any existing field name, and it pushes the fields
over by one ('ordernumber' is used to denote the ordernumber).
This patch also optimizes the GetBasketAsCSV subroutine a bit; it removes an unnecessary call to GetBiblioData,
since the order information retrieved from GetOrders already contains every field in koha.biblio and koha.biblioitems
This patch also removes the explicit sort done by publishercode, since the information returned by GetOrders is
already ORDER BY'ed, first by publishercode, then by title (there was a FIXME note in GetBasketAsCSV to do this, but
it's already done, so... :) )
To Test:
1. Create a basket with at least three orders: one from one publishercode, and two from another
2. Be sure to leave out any "\n" in your Order Notes, lest you fall prey to bug 6614!
3. Export the basket
4. You should see the orders sorted first by publishercode, then by title
5. Columns should line up correct all the way through
projects / koha.git / log