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
Owen Leonard [Tue, 19 Jul 2011 06:08:52 +0000 (02:08 -0400)]
Fix for Bug 6608 - Date-pickers broken on guided reports pages
Template variable scope errors.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6e2e58107f2347ec87281414fb0e5e12bf7806bf)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Thu, 14 Jul 2011 08:02:46 +0000 (04:02 -0400)]
Bug 6589: Adding supplements broken
To test:
- add a new subscription, choose 'create items on receive'
- receive some issues and create items > should work ok
- create a supplement, alone or at the same time as receiving a normal issue
- check if item was created and attached to the biblio record
Without patch this should give you an error message. Although supplement will be created,
no item will be added to the bibliogrpahic record.
With patch applied there should be no error message and the item should be created
and attached to the proper record.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d80659ce3543d01e0f9e4f280b63f76d00d2a27b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Thu, 19 May 2011 08:57:23 +0000 (20:57 +1200)]
Bug 6361 - make the packages work with koha 3.4
This commit does the following:
* Merge the changelog from the releases of 3.2
* Adds a command 'koha-upgrade-to-3.4' that does the MARC item splitting
stuff.
* Adds a debconf note to make sure people know that they need to run
the above command.
* Fixes the inclusion of jQuery in the packages.
* Makes build-git-snapshot build packages with a 3.5 version.
Owen Leonard [Wed, 13 Jul 2011 13:56:34 +0000 (09:56 -0400)]
Fix for Bug 6587 - Tag moderation lost colors
T:T variable scope error. Also correcting T:T
variable error with row numbering.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 05e90ad0f4d44e63091129edfcb819ecbb0ba6cd)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 13 Jul 2011 13:55:32 +0000 (09:55 -0400)]
Fix for Bug 6586 - calendar showing the wrong event type when editing
This bug must have been present for a while. There wasn't proper
handling of repeating yearly holidays when it came to the label.
To be clear, I believe this bug only affected holidays which repeat
yearly on the same date.
Instead of correcting the label to match the existing scheme I
added a new color code and label so that there are now two styles
for yearly and weekly repeating holdiays. This makes it more
clear what kind of repeating holiday you're looking at (rather
than having one color code for both).
After applying this patch, new and existing holidays which
repeat yearly on the same day should be color-coded orange and have
a 'Holiday repeating yearly' label. Weekly holidays are now
labeled 'Holiday repeating weekly.'
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1b0a8e997b2ec09e657fb04058533801abe5ec66)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 13 Jul 2011 10:07:47 +0000 (06:07 -0400)]
Fix for Bug 6570 - unlabeled box on funds form
The cause was a missing </select>, an error which wasn't
picked up by the HTML validator. Firefox 3.6 didn't have
a problem with it, but newer browsers must be changing
the way they accommodate markup errors.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0d8f8ce99d910061843d75520383e95d008e08db)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 13 Jul 2011 19:45:38 +0000 (15:45 -0400)]
Fix for 6426 - messaging not showing on patron categories
T:T variable name problems were causing the problem.
I used this opportunity to change the way the data is
output: Now the messaging preferences are only output
if there is a current setting.
Also corrected the js table sorter configuration for
the right columns and moved the template-based table
row striping to the tablesorter plugin config.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4c58011f4821a8d8ff84006dfc0c87b434a27865)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This requires us to specify all LDAP mappings in koha-conf.xml in lowercase,
instead of original case used withing LDAP.
Compare readability of
<userid is="hrEduPersonUniqueID" ></userid>
(which doesn't work) with required (and non-intuitive)
<userid is="hredupersonuniqueid" ></userid>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit b79c4c88a965a3233f359f8333a492effcf075eb)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 11 Jul 2011 15:59:02 +0000 (17:59 +0200)]
Fix for Bug 6573 - Library name entry field enforces unnecessary maxlength
Removing maxlength from branches.tt and other admin templates
which enforce it unnecessarily. Correcting other maxlengths
which do not match the database structure.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7b1ca473cc0307dfde997051e04fad664ba0503f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 7 Jul 2011 02:30:29 +0000 (22:30 -0400)]
Revised fix for Bug 6133 - Authorised values administration, warn for modifs
- Reformatted for T:T
- Changed wording slighly
- Styled message with new "note" style for non-dialog messages
- Added correct alert style to existing error message
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7f095be74ab2169eb4401bfc4f51abec08cc5a9f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
IntranetNav says the HTML will appear in the More
menu, but it appears to the left of the More
menu. This patch fixes the preference description.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit afe52ddc907488c99b065463f1b3156f7757a3da)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 7 Jul 2011 14:01:34 +0000 (10:01 -0400)]
Fix for Bug 6531 - clicking print button in opac causes 404 error
opac-detail and opac-ISBDdetail both use window.print(), so I've
added that to opac-MARCdetail as well. I've also eliminated the
"javascript:" pseudo-protocol because it's pointless. I'd
prefer to have a real link for non-js users but that will have
to wait for another bug.
After applying this patch users with JS enabled should get a
print prompt after clicking the "Print" link on opac-MARCdetail.pl
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f7893311481962c4ba7e51c26dce54466e21ccba)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Fri, 8 Jul 2011 19:07:41 +0000 (12:07 -0700)]
Bug 6476: Baker & Taylor content not working
Template Toolkit scope issue.
To Test:
1. Disable Amazon and Google bookcovers
2. Enable Baker and Taylor images
3. put SOMETHING in the BakerTaylorBookstoreURL system preference
4. check the source of opac-results.pl and opac-detail.pl, and see that SOMETHING in place between "https://" and the normalized ISBN
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 90dc391e1ab6fa552119be4e55ffe5702f0ea54f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Wed, 29 Jun 2011 18:43:50 +0000 (20:43 +0200)]
BZ6066 let's the librarian choose the itemtype when ordering
For libraries with item-level_itype, the itemtype is in the item.
For others, it's in the biblio and should be added with the title/author when it's ordered
This patch adds the list when applicable,and build the biblio record accordingly
(BibLibre MT5189)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit b6a28b1bee910dec8887f653794e75d0684b1c8a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Liz Rea [Wed, 27 Apr 2011 17:59:41 +0000 (12:59 -0500)]
Bug 4951 - Print page doesn't close after print This patch adds the print/close functionality present on all other slips to the full page account summary.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit fcdf50af6ef3321ce9373d41871f74bcc9b633df)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
3674 was encoding the password field when it was meant to be disabled
(password='!'), and then, in Auth.pm we were trying to compare an
encoded '!' with '!', which will never succeed.
This gets sure we encode only provided passwords and also includes an
auto generated login.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c5b1c39b80a592a4d05fd969566fe8766c1448ae)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Wed, 18 May 2011 14:20:51 +0000 (10:20 -0400)]
Fix for Bug 3397 - Deleting item record leaves a hole in patron's reading history
Excluding entries in old_issues which have a NULL itemnumber
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9047bd2ddfd902cc0c462dc6d9ce35cd1dfaace2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Tue, 5 Jul 2011 19:25:06 +0000 (15:25 -0400)]
Bug 6305: receiving serials does not create items
Template::Toolkit variable scope issue.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f2fa6c893cb4ad8e57ec0f83fdcb90aed75f2507)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Wed, 8 Jun 2011 08:12:13 +0000 (09:12 +0100)]
Bug 6305: Copy enumchron into created serial item
Should work for normal and supplemental issues.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ad26a21056560f40627e9fc027bdb3f6fcbc9b25)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Wed, 8 Jun 2011 08:06:36 +0000 (09:06 +0100)]
Bug 6305: Subscriptions can not be edited
This seems to fix the problem with editing existing subscriptions. Please test.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3b297b0e4462ae693706a439c182bb8711b0b57f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
JAMES Mason [Mon, 30 May 2011 08:54:24 +0000 (20:54 +1200)]
Bug 6411 add another example to README.robots
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2e8fe364cb4dc212c397874b894a306876c66d17)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6470 - Unable to filter out log entries for kohaadmin (user 0)
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e653e8ce0ba74050b6786e62df67cccda6f1c1a4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Jesse Weaver [Thu, 9 Jun 2011 23:22:18 +0000 (17:22 -0600)]
Bug 6492 - Deleted biblios cause rebuild_zebra to fail
This both adds a bit of a failsafe to get_raw_biblio, and prevents
records that have been deleted from being updated by the same instance
of rebuild_zebra.
Minor amendment to remove duplication of 6433
Signed-off-by: MJ Ray <mjr@phonecoop.coop> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 048c0dc04e9daf73a2e425c0e75f4a1384bfc5b7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 5379 - import_borrowers.pl fails with db insert/update errors
Some spreadsheet programs use smart quotes which causes the db to throw
an error when an insert/update is attempted due to improper processing
of the CSV file. This patch adds code to check for smart quotes and change
them to "dumb" quotes.
This patch also adds more logging of errors and a notice to the user to check
the logs for errors when they occur.
Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ae48ebbcaae50a0af7ceca00d04f2aedb8d5cc2c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 30 Jun 2011 20:00:08 +0000 (16:00 -0400)]
Fix for Bug 6543 - Column hiding on batch item edit/delete not working
T:T variable name problem.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 36c8531394f354c694d1f72d8769461dccc9591f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6549 : sco-main.pl: Parentheses missing around "my" list
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 8ad4fa34c12643ced8abfb03f9ae69ee5dea611a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Magnus Enger [Thu, 2 Jun 2011 19:36:14 +0000 (21:36 +0200)]
Bug 6450 - No check in/check out messages in message_queue
Huge thanks to Katrin Fischer for spotting what was the trouble here!
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit 610457ea415b552c5f644d6025a127dea1fb3908)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 21 Jun 2011 14:37:47 +0000 (10:37 -0400)]
Alternate fix for Bug 6522 - search result list broken
- Adding back the colspan removed in a previous commit
- Correcting the scope of two template variables.
Before applying this patch, the search results page in the
staff client will have misaligned headers if AmazonCoverImages
is turned off. After applying this patch headers should
appear correctly with AmazonCoverImages on or off.
Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit daf2190a5571fdfbd831258428b3a488736d546f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 16 Jun 2011 12:48:47 +0000 (08:48 -0400)]
Fix for Bug 6501 - missing scroll bar when updating child
- Adding "scrollbars=yes" to window.open javascript.
- Adding javascript tablesorter to categories table
To test, open a child patron record and choose more ->
Update Child to Adult Patron from the toolbar menu. The
resulting pop-up should have scrollbars. The table
of categories should be sortable with a default sort
on the description.
Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 65d4d3c9b0fd3fef7ce4c86be77993d1dc2b64f6)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
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>
projects / koha.git / log