Chris Cormack [Sat, 23 Jul 2011 08:09:08 +0000 (20:09 +1200)]
Bug 5429 : Covers for detail page and database update
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Sat, 23 Jul 2011 07:56:33 +0000 (19:56 +1200)]
Bug 5429 : Open Library book covers
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 5131 :restrict use of sort_by value to allowed values
The user input for sort_by value was used without care, resulting the possibility for user to set any Template Variable to 1.
This patch restrict the values to sort field.
The list of allowd_sortby was taken from 'includes/resort_form.inc'.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Marcel de Rooy [Mon, 29 Nov 2010 13:29:34 +0000 (14:29 +0100)]
Bug 4839: Adjust default values for MARC21 authority Fixed-Length Data Elements
Currently, the default for this MARC control field is hardcoded in the plugin code of marc21_field_008_authorities.pl (two occurrences).
This patch moves it into a new syspref. If this pref should not exist, the old hardcoded value is used. Authorities preference file is updated too.
A warning is generated if the length of the field is not correct.
Furthermore, the default for position 14 (heading use: main or added entry)
should be dependent on the authority type. For CHRON_TERM, GENRE/FORM and
TOPIC_TERM, it should be b (not appropriate) instead of a (appropriate).
Rebased on March 17. Follow-up patch added for installation pref.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Bug 4959 (Language inconsistencies on basket groups; skip confirmation when closing basket)
This patch adds a new pref BasketConfirmations. This adds the option to skip
confirmations on closing and reopening a basket. If you skip the confirmation,
you do not create a new basket group.
The confusing line Create a purchase order (when closing a basket) is replaced
by Attach basket to a new basket group with the same name.
A warning for a null value on basketgroupid is fixed.
Rebased April 11.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 5263 - Add support for including fields from the ISSUES table in advanced due notices
Adding support for including fields from the Issues table in advanced due notices.
This is primarily to allow the inclusion of the due date for each item in the
advanced due notice, but will allow the inclusion of any field from the ISSUES
table.
This also adds code to exclude timestamp fields as these are irrelevant to the
end user in this context.
Note: Documentation should be updated to reflect the availability of the additional
fields in all circulation notices.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Mon, 1 Aug 2011 03:05:09 +0000 (23:05 -0400)]
Fix for Bug 6635, Can't page through results in label batch
- Fixing T:T scope issue
- Correcting footer include for pop-up windows.
- Markup correction for validity.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Thu, 5 May 2011 14:32:08 +0000 (15:32 +0100)]
Bug 6311 check_inst_id was being passed non-existent value
Due to a typo in the hash key check_inst_id in the
handle_end_patron_session was always logging an error
as the actual field contents were not being checked
unlike in other messages
Signed-off-by: Frederic Demains <frederic@tamil.fr> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
5662: Show control number without organization code in OPAC URLs
OPAC detail xsl adjusted at four places: 773 when leader19=c, 775, 780, 785.
Enable the pref UseControlNumber when testing this patch. And set pref OPACXSLTDetailsDisplay to using XSLT stylesheets.
Test by adding a control number ($w) in abovementioned fields.
Go to opac detail and check if the links work.
Add some orgcode between parentheses or brackets in front of the control number.
Test again in opac detail if the links still work.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works with and without orgCode in front of $w now.
No change to current behaviour, but closer to MARC21 standard.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Sun, 17 Jul 2011 20:43:31 +0000 (22:43 +0200)]
Bug 4433: Small display problem for topical subjects
This removes the subfield codes shown for topical subject authorities only.
To test:
- Add different authority records and at least one for a topical subject.
- Use search in intranet and opac (turn on opacauthorities) to serch for your subjects.
- All headings will show without the subfield codes (at least $a in front), except the
topical subject.
This patch removes the subfield codes for the topical headings.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Works as advertised in opac and staff. (July 18, 2011)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
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>
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>
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>
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>
Magnus Enger [Wed, 20 Jul 2011 17:01:19 +0000 (19:01 +0200)]
Bug 6540 - Add config file as command line option for koha-create
Order of precedence for config options, from lowest to highest:
1. The defaults set in koha-create itself
2. /etc/koha/koha-sites.conf
3. Config file specified with --configfile
4. Individual options set with --marcflavor, --zebralang, --defaultsql
Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
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>
Owen Leonard [Thu, 21 Jul 2011 15:16:08 +0000 (11:16 -0400)]
[SIGNED-OFF} Fix for Bug 6623 - Nicer style for "clear screen" button
This patch replaces the <button> element with an "X" link
styled to appear fixed to the upper right corner of the box
containing the barcode input field. A title attribute
shows "Clear screen" on hover.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Ian Walls [Fri, 22 Jul 2011 12:08:20 +0000 (08:08 -0400)]
Bug 6547: Add id attributes to messages in opac-reserve.tt
In order to allow easier styling with JQuery, including text substitution,
this patch adds id attributes to each div tag containing a holds message.
The following ids are added, corresponding to the template variables of the
same names:
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>
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>
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
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
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>
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>
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>
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".
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
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.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 5 May 2011 13:46:45 +0000 (09:46 -0400)]
Alternate fix for Bug 5876, New permission for overdues report
Original fix included a change for offline circ that depended
on a fix for another bug. This patch adds only the permission
for the overdues report and is formatted for TT.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Bug 5867 : Improved the email checking when sending "Hold filled" notices.
The subroutine for sending HOLD and HOLD_PRINT notices only checked the
"email" field of the borrowers table and didn't check the value of the
AutoEmailPrimaryAddress preference. With this patch, "Hold filled"
notices can now be sent using the other email addresses of the member.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5867 Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Zeno Tajoli [Fri, 13 May 2011 07:27:54 +0000 (09:27 +0200)]
Bug 5462: Update of the italian sql files The bug is about strings that are used as variables by Template::Toolkit The strings need to be like valid perl variable names. To fix the bug we need to fix also .sql files. Others .sql files are OK. Italian .sql file needs this fix
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
projects / koha.git / log