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
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>
projects / koha.git / log