Magnus Enger [Thu, 16 Jun 2011 11:51:58 +0000 (13:51 +0200)]
Bug 6510 - [REVISED] Sort by in intranet search alters search and number of hits
This patch uses .*? instead of .*
To test:
- In advanced search in the intranet choose Author as the search index
- Do a search for an author, check the number of hits
- Choose another value than the default from Sort by
- Check that the number of hits is the same as for the original search, once
the hits have been re-ordered
Signed-off-by: MJ Ray <mjr@phonecoop.coop> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9efdfa1ba2360bfec2b2d88a6a6388b2dfe77a36)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Due to misconfigurations in record.abs, author fields other than 100 and most
title fields cannot be searched using CCL field prefixes. This patch adds the
appropriate indexes on 110, 111, 130, 210, 211, 212, 214, 222, 700, 710, 711,
730, 740, 780, and 785. It also adds a missing Title-later bib1 attribute.
NOTE: The files etc/zebradb/marc_defs/marc21/biblios/record.abs and
etc/zebradb/biblios/etc/bib1.att were both modified, and will have to be updated
on dev installations. The database will need to be reindexed to take advantage
of the updated indexes.
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com> Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 77462a7e2dc7afcca591f249c771d3ae70f7df16)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
MJ Ray [Mon, 20 Jun 2011 16:43:49 +0000 (17:43 +0100)]
Added LSB information and copyright headers to two scripts in misc/bin. Thanks to Mahesh T Pai <paivakil@gmail.com> for the mailing list post Message-ID: <87y60x10de.fsf@gmail.com> containing them.
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 20bd7f851f321c6089b35a629e26b3be3f968362)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Tue, 21 Jun 2011 11:54:55 +0000 (07:54 -0400)]
Bug 6521 - allow blank cardnumbers to not trigger "already in use"
Now a blank cardnumber will get stored as a null in the database, which
is a value that allows duplicates. As such, if cardnumbers aren't
mandatory, then you can actually save a user with it being blank.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 785af7310daa4633359755add9474e81f108d022)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Wed, 22 Jun 2011 17:09:22 +0000 (10:09 -0700)]
Bug 6525: hold filled emails not going out
When the message name was updated from "Hold Filled" to "Hold_Filled" for T::T compatibility,
the line in _koha_notify_reserve that looked up the letter code by the message name no longer
matched, so none of the messages were sent. This patch just replaces the space with an underscore
to get the names aligned properly.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 26965cf1dfe4a8a34a97280c0aba72a8b59d7e4a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6453 Corrects the barcode comparisons in inventory.pl
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 59c42cd7f32006797eeb92c39af64c1fafc41a8e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Mon, 13 Jun 2011 08:08:28 +0000 (04:08 -0400)]
Bug 6497: MARC URLs not showing up in details pages under normal view
Part one: followup to the original patch. The variable name for the URL itself was wrong, so despite
getting the link to show up, the href was the catalog page itself, NOT the 856$u. Updating "MARCurl.MARCurl"
to "MARCurl.MARCURL" fixes this issue.
To test: go to the OPAC, and see that the URL in the link is the same as the URL in the MARC
Part two: this problem is present on the staff side, as well. This patch implements both parts of the fix
(renaming "MARCurlS" to "MARCURLS" and "MARCurl.MARCurl" to "MARCurl.MARCURL")
To test: go to the staff client, and check that a)URLs show up and b)they link to the URL in the MARC record
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 59ac64db973b3a0f4cebd6c5933c4f78bf0dbc2e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Jeremy Crabtree [Fri, 17 Jun 2011 03:02:50 +0000 (15:02 +1200)]
Bug 5094 auth_by_bind authentication can fail even if given a correct password and userid
When using
<replicate>0</replicate> <!-- add new users from LDAP to Koha database -->
<update>0</update> <!-- update existing users in Koha database ->
<auth_by_bind>1</auth_by_bind> <!-- set to 1 to authenticate by
binding instead of password comparison, e.g., to use Active Directory -->
Auth_with_ldap attempts to lookup the userid in the LDAP directory to
fill $userldapentry despite it being unneeded in this case. The information
retrieved will be thrown away, thus there is no need to retrieve it.
This can cause authentication to fail overall even if the initial bind with the
user's credentials succeeded
Signed-off-by: Joe Atzberger <ohiocore@gmail.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7bb178e30be74abda82eb4fcaaa873be3dfcc5ef)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Thu, 16 Jun 2011 20:53:17 +0000 (16:53 -0400)]
Bug 6512: time missing from item circulation history
Re-enables the display of the seentime in circ/bookcount.tt; a DEFAULT was set, but
the value was never actually called into the template.
This patch also moves the time to the right side of the date, and removes the ??:?? default,
because otherwise, it's just silly
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fbfb68a444c7f30f363b952a40d00870f0a99295)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
When using auth_by_bind, search was always done as anonymous user.
This is a problem if we want to fetch LDAP values which have ACL
permissions only for users.
This change moves bind from search_method back into checkpw_ldap,
making code cleaner and easier to understand
Ian Walls [Mon, 13 Jun 2011 19:08:59 +0000 (15:08 -0400)]
Bug 6497: MARC URLs not showing up in OPAC detail page with XSLT off
Renames T:T variable to match what's exported from opac-detail.pl.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b5dcd096bf7bd86853458b0bdaa5a8bb44726cbd)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Fixing code for 3.3.0.42 update.
Adding code at end of update script if install past that point already.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a3717c1fe91401aee9d2c89ffe6dc3394b4892e1)
Conflicts:
installer/data/mysql/updatedatabase.pl
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 5684 : Remove all items fields from a Z39.50 record imported for acquisition.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f6486e63904f728fbdf5a9def8082777a101c64f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Galen Charlton [Mon, 24 Jan 2011 21:55:01 +0000 (16:55 -0500)]
bug 5653: use itemcallnumber in bib label layouts
The sample bib label layouts and the hard-coded default
format_string for new layouts used 'callnumber' when they
should have used 'itemcallnumber', preventing call numbers
from being printed on spine labels that use the system-supplied
layouts. Besides correcting the sample data, this patch
now also enshrines 'callnumber' as an alias for 'itemcallnumber'. Signed-off-by: Galen Charlton <gmcharlt@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
After applying patch it works for new and old layouts (itemcallnumber and callnumber).
Fridolyn SOMERS [Wed, 1 Jun 2011 08:42:46 +0000 (10:42 +0200)]
BUG4319 waiting items cannot be reserved
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 98f278022726c3622a1527cb4e8eb23228d28187)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6355: Correct GetLateOrders so it ignores cancelled orders
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Testing plan copied from bug:
- Create a new basket for a bookseller
- Create two new order in this basket. The orders must have a price or else
they won't be shown in the "Late orders" report.
- Delete one of the two orders.
- Close the basket
- Check for late orders and use "0 days ago" as a filter date.
- The deleted item appears in the report.
Janusz Kaczmarek [Tue, 17 May 2011 19:04:18 +0000 (22:04 +0300)]
Bug 6357 : Displaying the unavailability of items corrected
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ead90e11797a40384167e25b26c039a93bda75b8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6363 : Make the "Item Location" selectbox appears correctly in inventory.pl
The "Item Location" selectbox didn't appear when the only available MARC
framework was the default framework.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2bdd8ebd1e12ed0ab185af2cd7d57f70811a30e3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 25 May 2011 12:54:59 +0000 (08:54 -0400)]
Fix for Bug 6377 - fines should be red on patron search
Adding classes for credit (green) and debit (red)
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a17e9712507b2f30b232503747cee4c5daa274ab)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Fridolyn SOMERS [Mon, 23 May 2011 11:51:14 +0000 (13:51 +0200)]
BUG6389 Administration menu like Tools menu
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6443fae16d098c3c47aaadd22f2ee0d0257d89cf)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 24 May 2011 16:11:07 +0000 (12:11 -0400)]
Fix for Bug 6402, Lists sorted by year appear to be empty
If you create a list, populate it with titles, and then change the sort to
"year" it will appear as if your list is empty. The SQL in VirtualShelves.pm's
GetShelfContents tries to accept "year" as a sort by but 'year' is not a valid
column name.
The SQL pulls biblioitems.publicationyear. Changing this to
'biblioitems.publicationyear as year,'
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a13194f2cde980dc38efbf4e125754ee6449f91c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Galen Charlton [Tue, 24 May 2011 19:25:41 +0000 (15:25 -0400)]
bug 6409: fix pagination of SQL report output when parameters are used
Fixes bug where paging through output of an SQL report that includes
one or more parameters fails by asking you for the parameter values
and again and sending you back to the first page of results.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com> Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 577ce72e91dfafda270deb37d20c4ef1d573d493)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Fridolyn SOMERS [Mon, 23 May 2011 13:13:21 +0000 (09:13 -0400)]
BUG 6388 Broken pager images in branch_transfer_limits.tt
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 529842ab6c34198e4c64a1bfe97b9ff34e456f40)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6462 - Authority type is not displayed in OPAC
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1b5805e336fbcc91def6d10b13d091fe918e8bbe)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6463 - Authorities browsing error when using auth. plugins
[2011.06.05] I confirm the solution. On my test UNIMARC installation, I haven't
an error 500 but I have a wrong result pages navigation bar which doesn't limit
search result on the selected authority type.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 86096350a9904990b402dd84a089c4f733382db1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 8 Jun 2011 14:07:32 +0000 (10:07 -0400)]
Fix for Bug 6487 - No error explanation if patron expiration date is missing
The script tries to parse the patron expiration date without
checking that it is a valid date. If expiration date is empty
it doesn't get caught along with past expiration dates.
I wonder if this line was supposed to catch this problem:
Line 233: if ( $warning_year*$warning_month*$warning_day==0
This patch adds "!$borrower->{'dateexpiry'} ||" to that line.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 84a8c9a52222355dc298d00164f363f37e9a400c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Elliott Davis [Wed, 8 Jun 2011 16:16:00 +0000 (12:16 -0400)]
Bug 6491 Added: id in opac-privacy around the privacy policy div container Testing: An ID should appear in the container for the privacy rules saying userprivacy
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bc8984f5d6d7169d7758baa1dd8104c8bbb347c5)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6464 Check inconsistent placeholders in translated strings
Display a warning for strings that don't have the same count of %s placeholders
that the English original strings. Don't warn for not translated string and
'fuzzy' string because those strings are not installed, and this is the
translator responsability to examine them.
Based on Frère Sébastien Marie work.
Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2281350b6eb2b4d7043aad7baeb93f9bfa185a91)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Updating INSTALL.opensuse file with the changes by Freek de Kruijf
Freek de Kruijf (from @opensuse.org) has adapted the installation
guide (that I - Ricardo Dias Marques - had created) about installing
"Koha 3.0.0 in openSUSE 11.0" and he kindly updated it with the
information about installing the same version of Koha (3.0.0),
but on a more recent version of openSUSE (openSUSE 11.3 instead
of openSUSE 11.0).
He also has put his version on the Koha Wiki:
Koha 3.0.0 on openSUSE 11.3
http://wiki.koha-community.org/wiki/Koha_3.0.0_on_openSUSE_11.3
This commit updates the INSTALL.opensuse to have the content of
that wiki page (last modified on 16-Oct-2010), changing only
things that are related to converting the format from a wiki
page to text format (replacing some HTML tags by some markers
and replacing screenshots by their descriptions).
This commit may be applied to the "master" branch and it can
also be "cherry-picked" to the "3.2.x" branch.
Katrin Fischer [Mon, 6 Jun 2011 21:32:28 +0000 (23:32 +0200)]
Bug 6472: HidePatronName on detail page broken
TT issue
To test:
- Check out an item to a patron
- Go to detail page of the title in intranet
- Normal view will show cardnumber when HidePatronName is activated
- Normal view will show patron's name, when HidePatronName is off
Hold page was not broken.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4cf1046816d86200f1d55030b9bb28684059563d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Fridolyn SOMERS [Tue, 17 May 2011 16:10:01 +0000 (18:10 +0200)]
BUG6067 When Add Duplicate changing framework would loose data
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c78a926046f93606681e64c332f374aa2bba603e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 5868 follow-up: missing subfields in subject index
Index 658 (curriculum) as subject, and add some missing subfields to the subject
index.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e594e8c8b9ce762faa8e7377e54a91f6c525a0c6)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole C. Engard [Wed, 11 May 2011 08:30:20 +0000 (04:30 -0400)]
Bug 5268: Change all occurances of 'debar' to 'restrict'
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 54d42771258681762b659a2685e2678dc6bd8ef6)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 2 Jun 2011 06:30:22 +0000 (02:30 -0400)]
Fix for Bug 6446, batch item deletion interface problems
Scoping error in T:T variable caused incorrect column display
in batch delete and batch edit interfaces.
After applying this patch header cells should align correctly
with content and checkbox column should appear.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 529b6ab9fe21a508e01e1eb8dd37d83e8e2556c7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6444 Corrects encoding problems in subscription-add.pl
When searching for a vendor, if the vendor has accented character in its
name, the vendor's name that's added in the form of subscription-add.pl
is encoded incorrectly.
[2011.06.01] F. Demians. Port it to 3.4
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ddcf63d29b7f4fc20e46765b76df95e037caa2d6)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 2246 - (Partial) Label printing doesn't work with Unicode characters
This patch provides a very partial fix for this bug in that it reduces
the number of pdf generation failures due to a "wide character" error.
It does not ensure that all unicode characters will print correctly as
this is dependent upon many other issues mentioned in this bug and
various posts to the developer list.
What this code does is test to see if the pdf stream is utf8 encoded
and if it is, explicitly declares it to be so. Unicode chars will still
print incorrectly, but the pdf will be created and should open properly
in whatever pdf reader.
You may test this by adding any character with a diacritical to the
title of a bib and then attempting to generate a label pdf with the
title of that bib. Before the patch is applied the resulting pdf
should contain an error mentioning a wide character issue. After the
patch is applied, the pdf should be valid.
No documentation changes are necessary as a result of this patch.
This patch should be backported to 3.2.x.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 939d0ab63939ad5cd2d6946bc203208d533089d2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 13 May 2011 14:58:18 +0000 (10:58 -0400)]
Fix for Bug 6337 - Variable scope errors in staff client cart print view
Also removing "Return to cart" link from the print view,
redundant now that the print view prints and redirects
automatically.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ded47a7793dc2bf8568a01ce2d7b8467d6f3b5b8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
bug 6442 change opacnav wording so it's more accurate
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ee05848331e29145c33d30ff20a573e5185b89e4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6397: fix variable name in template that mis-aligns table
This patch repairs the detail table when enumeration and chronology is present.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bf503688a0b852b268677790b1a47a861f6eef10)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 27 May 2011 12:54:06 +0000 (08:54 -0400)]
Fix for Bug 5714 - Unescaped ampersands in OPAC facets
In the OPAC the "query_cgi" variable passed to the template
outputs a string like this:
idx=kw&q=thing
The ampersand is unescaped. Adding an "|html" filter to
the variable. Also correcting some TT markup which
added a new validation error (an unopened <div>).
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a53ae578b428a3cddd2802a972ee048b479a44aa)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
wr77490 (bug 5929): use branch email in preference for due notices
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5ae3a3aa4f79f457605e03f53a4b385212d9d93e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8b3c9e3ef975c72fb025930d58358d3564cb0aac)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6452 : Use placeholders in sql but makepayment seems dead code ?
Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4475e9a67574c32cd01b47bf6f22aeb3cc0eb648)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Fridolyn SOMERS [Tue, 31 May 2011 13:16:15 +0000 (15:16 +0200)]
BUG6436 Don't allow deletion of an itemtype used in items.itype
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8e8093b4fbcaa75a71134d621f6d328f13390d07)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6362: fixes display to re-embed items in OPAC MARC view
This patch is a followon to repair a side-effect of Bug 5579. A
similar patch is already pushed to make this change for ISBD view.
Signed-off-by: Liz Rea <lrea@nekls.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 586a476ec4a62f47128d16dc77f2d1145e50a493)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 5683 follow-up: calls to ModBiblio can still fail
Because C4::Charset directly manipulates the MARC::Record object, bad data has
to be cleaned in ModBiblio before the call into C4::Charset. The corrupted
records can also break the Zebra index. After this fix has been applied, it
would probably be a good idea to run the misc/maintenance/touch_all_biblios.pl
script to ensure that this problem has been cleared up.
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5bbfb94f4399485a96c7f4478a3641da450926ca)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Add unit tests to ensure bug 5683 doesn't reappear
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit d949472324b37b4484ec962bf96722c118a2bac2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 11 May 2011 14:51:01 +0000 (10:51 -0400)]
Fix for Bug 6338 - Datepickers on OPAC hold form does not work
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 98ff8672e8b10a8835fe6ec37c4a161902a52ffb)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 20 May 2011 19:38:51 +0000 (15:38 -0400)]
Fix for Bug 6306 - It is not possible edit news
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 71d9dfda3c75a53485abbb1eec95e4e9720a1f53)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Fri, 27 May 2011 05:46:06 +0000 (07:46 +0200)]
Bug 6415: Can't make patron card batch
TT corrections from bug 6343 for label creator were also needed for patron card creator.
- Manage Batch and New Batch were missing the branch info
- Add link on patron search was missing batch id parameter
To test:
- Check branch is correctly shown on pages 'Manage Batch' and 'New Batch'
- Check you can create a new batch and add names to it by using the 'Add'
right to the patron's name
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8a3160c870d17c4a4efa7d91afa018afc5b4f442)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 25 May 2011 16:55:22 +0000 (12:55 -0400)]
Fix for Bug 6408 - column alignment off on the patron categories admin
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f7d0939942268e736f5d7939417ba3d6532f2f79)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Janusz Kaczmarek [Wed, 18 May 2011 16:19:28 +0000 (18:19 +0200)]
Bug 6365: Missing information about tab number when mandatory fields unfilled
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 52ebf8f3f0dde98386cf5a12917c19e6d236a465)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 18 May 2011 15:01:20 +0000 (11:01 -0400)]
Fix for Bug 6364 - Display of item availability broken on OPAC detail screen
Owen:
The markup for showing item availability has been moved to an include
file. The include lacked the scope declaration for the item results
loop. Adding the scope declaration to the include file means it can't
be used by other template unless within the same scope, but I'm not
aware of a better way to do it given the number of variables in use.
Frédéric:
I confirm the bug.
I propose a alternative solution which solve the bug and keep its
versability-reusability to the include file. With this solution, when including
item-status.inc, the foreach loop variable name, which can change from template
to template, is renamed by using a local variable definition: ie a variable
name specified after file name in the INCLUDE directive, this variable
temporalily masking any existing variable.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 559091c5589887adc774e2f217c64de390270d4e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 11 May 2011 14:56:39 +0000 (10:56 -0400)]
Fix for Bug 6300 - can't get to other pages of marc import
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 31fbe0d70dff7ed4e04a4b84462c6c833090ead2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 16 May 2011 19:42:12 +0000 (15:42 -0400)]
Follow-up fix for Bug 6170 'More options' in advanced search broken
Simplifying markup in the staff client advanced search:
- Moving IDs to fieldsets and removing redundant divs
- Removing unused section
- Adding missing IDs and fieldsets
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c97868ef6338d2dd41f9d75618c9d4ff9a0db8cd)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 25 May 2011 16:52:23 +0000 (12:52 -0400)]
Fix for Bug 6417 - Template variable errors in Guided Reports
Looks like the T:T conversion script missed these instances
of TMPL markup because they had line breaks:
<!-- TMPL_VAR
NAME="name" -->
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d19998413a7a67798626400466e8adaee167a579)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 13 May 2011 15:11:46 +0000 (11:11 -0400)]
Fix for Bug 6332, Hold forms missing 'clear date' link
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3e69eb7cddeeb31c4c72cc4a0e994e17c691fc0b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 24 May 2011 17:00:29 +0000 (13:00 -0400)]
Fix for Bug 5020 - on patron record sex should be gender
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f1ecfc7669f085c7577100db2902ac0de34b827e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 20 May 2011 14:48:13 +0000 (10:48 -0400)]
Fix for Bug 6378 - Misaligned columns on tags approval page
T:T variable scope correction.
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 fa7d6a0435f5ef2e6b8f50a61b95d4bfc22c8bef)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a8f5bf93f962ae21c2bddf32832a511d9e778e12)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
I added a comment on the file so the user uncomments the appropriate koha-conf.xml sections.
To+
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b4b445818f46e59cf62f968f219963c132832c2b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Frédéric Demians [Sun, 15 May 2011 05:23:03 +0000 (07:23 +0200)]
Bug 6342 Help link doesn't popup anymore contextual help page
Fix help.pl script to deal with Template Toolkit.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit becc07cb7b944f66d7f7df92dfc69317e8127d1e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 20 May 2011 19:22:11 +0000 (15:22 -0400)]
Fix for Bug 6370 - news showing that it's for the opac when it's for the librarian interface
T:T variable scope error.
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 28eca1ec926e2971cf20d1ce18dafe6896fb7db8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
D Ruth Bavousett [Tue, 17 May 2011 15:45:48 +0000 (11:45 -0400)]
Bug 6351: Unable to delete branch-specific circulation rule
The URL on the page did not have a branchcode, so the delete failed silently, and
returned the user to the "All" rules page. Turns out, the array for the rules was
not being populated with the branchcode!
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 eba64bf25d8da0f091ce0b5d8329385638fb1fe1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Sat, 14 May 2011 10:36:25 +0000 (12:36 +0200)]
Bug 6340: Pagination bar on guided reports result page broken
The pagination on the guided reports page was not showing up.
TT problem.
To test:
Add a sql report with more than 20 results.
Example: select * from borrowers
Without the patch, only the first 20 results will show and no pagination bar.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ad6ec128e7cb012bd0e4afa8ac168b0c6b08d5db)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Patch fixes a TT error that caused Build New to be empty.
To test:
Click More -> Reports, you should see the welcome page and be able to step through creating the report.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 14364d9866dd65abb737a59e49f297328edde83d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 17 May 2011 15:07:03 +0000 (11:07 -0400)]
Fix for Bug 3140 - It is possible to email someone else's private list
Adding check for ShelfPossibleAction("view") to make sure the logged
in user has permission to view the selected list when downloading
or emailing a list.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b65f6d0a99dc13e73aed5058a44a72895c829b32)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 24 May 2011 19:15:18 +0000 (15:15 -0400)]
Fix for Bug 6395, Cannot create routing list
Some old TMPL tags got left behind.
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 5984520211337750fbae0fe5a5fcba7cb85bf212)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Fri, 20 May 2011 19:14:56 +0000 (21:14 +0200)]
Bug 6343: TT issues in label creator
- Manage Batch had no branch set
- New Batch had no branch set
- Add link on item result list was broken, missing the batchid
To test:
Create a new batch and add items one by one. Look at 'Manage batches'.
Check that the branch in the top right corner is always correctly shown and set.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit f515052d6e2a41f0a84b2999204691a84ebe78e1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This patch adds Ian Walls' name to the history file, so he can be found.
Signed-off-by: Liz Rea <lrea@nekls.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 59e9137d8339de68f2cc4c7dcc60f4e2d7fbea43)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Tue, 17 May 2011 03:36:01 +0000 (15:36 +1200)]
Bug 6350 : Updating history docs
http://bugs.koha-community.org/show_bug.cgi?id=6350 Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 37cf503fdf1006e0c0c935e795dfc8cb4af80c9a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 18 May 2011 18:05:47 +0000 (14:05 -0400)]
Fix for bug 6367 - 'Preview MARC' hover button does not show correct MARC record
Misplaced line of JavaScript meant that the menu always grabbed
the ID of the last item in the search results.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3b8c61d5dcd985ea4e2bd80f9f0628f4cb4dd7c0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Frédéric Demians [Wed, 18 May 2011 05:23:21 +0000 (07:23 +0200)]
Improve error message when translation installation fails
For Translator Manager (myself...). A translation installation may fail because
translator hasn't enter properly string parameters (%s). With this patch, the
message ID is displayed not only the parameter.
projects / koha.git / log