Paul Poulain [Fri, 9 Dec 2011 08:51:40 +0000 (09:51 +0100)]
Merge remote-tracking branch 'origin/new/bug_6679'
Paul Poulain [Thu, 8 Dec 2011 16:13:38 +0000 (17:13 +0100)]
Bug 6679: fix missing use strict
The 3 files had use strict missing. The patch add the use strict and modify what's needed to work with it
4XX.pl also has some perlcritic fixes:
Variable declared in conditional statement at line XXX, column 9. Declare variables outside of the condition. (Severity: 5)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Paul Poulain [Fri, 9 Dec 2011 08:39:38 +0000 (09:39 +0100)]
updatedatabase: Adding missing \n at the end of 2 print
They were missing on bug 6530 and 6328
Robin Sheat [Mon, 17 Oct 2011 04:51:39 +0000 (17:51 +1300)]
Bug 7028 - updated the koha-conf.xml template
Now it more closely matches the one that's distributed in /etc
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(not tested. I confirm the code is clean, and tests are not broken)
Owen Leonard [Wed, 26 Oct 2011 14:50:11 +0000 (10:50 -0400)]
Fix for Bug 6818 - acquisitions basket groups could use some design work
I've made changes to the basket grouping interface to bring it
in line with other interfaces in Koha. I think it's better to
keep things following a consistent pattern.
On the page which lists basket groups:
- Basket groups listed in a table instead of as custom-styled lists
- Buttons use standard style
- Tabs are generated by jQuery
On the page for managing baskets in a group:
- Markup has been revised to be more consistent with established
patterns.
- Corrections have been made for validity
On the basket view page:
- Display of data has been streamlined a little bit
- An option has been added to the "Basket group" dropdown
for adding a new group
- Markup has been corrected for validity and consistency
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
1) Basket group page
The blue is gone and the new buttons are much better
readable than before.
2) Basket grouping page
Works.
3) Basket view page
I like the new option to create a new group from here.
Nice improvement to the workflow!
I removed a spare 'td' from line 264.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Owen Leonard [Wed, 7 Dec 2011 15:02:56 +0000 (10:02 -0500)]
Bug 7259 - Show a count of items pending approval on staff client home and tools pages
- Correcting permissions checks on the home page
- Adding default parameter (1) to numberofreviews subroutine
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Owen Leonard [Wed, 23 Nov 2011 19:25:20 +0000 (14:25 -0500)]
Bug 7259 - Show a count of items pending approval on staff client home and tools pages
This patch adds count indicators on the staff client home page and
the tools page for the number of items pending approval. On the
home page this includes suggestions, comments, and tags. On the tools
page a count of pending comments and tags is shown.
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Counts appear for all types of actionable items listed, all are clickable through to the proper place.
Nice work!
Katrin Fischer [Sun, 30 Oct 2011 23:21:27 +0000 (00:21 +0100)]
Bug 7116: White space on item form for bulk ordering from staged file
Same fix that was done for normal order page and receive page.
Moving the style element for hiding the subfield into the li tag.
AcqCreateItem = on order
To recreate:
1) stage a marc file with 1 - many records
2) make sure you have an acq framework with hidden fields in 952
3) create new basket
4) order from your marc file
5) check item form below the record list for white space
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Followed the steps outlined by Katrin above. Before the patch there are gaping
holes left by the hidden fields. After the patch the holes are gone.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Thu, 8 Dec 2011 10:26:02 +0000 (11:26 +0100)]
Welcome to jon Aker (#164) + missing tabs & "releases"
Jon Aker [Tue, 6 Dec 2011 23:06:41 +0000 (12:06 +1300)]
Bug 7020 Items with no checkouts report does not output call number, barcode or item details
When running the Items with no checkouts report and outputting to
screen, the results do not include any identifying information for
the items. The only information listed is the item count and the
branch location.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Colin Campbell [Fri, 7 Oct 2011 12:19:06 +0000 (13:19 +0100)]
Bug 6987 Make return from Overdues::GetFine consistent
If there is not a fine amount return zero not
undefined or other undefined behaviour
Use more meaningful var names for readability
Signed-off-by: Sophie Meynieux <sophie.meynieux@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Thu, 8 Dec 2011 10:05:35 +0000 (11:05 +0100)]
Merge remote-tracking branch 'origin/new/bug_7141'
Chris Cormack [Wed, 7 Dec 2011 20:28:12 +0000 (09:28 +1300)]
Bug 7141 : Changing test to match new formatting of xsl style sheet
http://bugs.koha-community.org/show_bug.cgi?id=7141
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
verified tests pass
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Chris Cormack [Thu, 8 Dec 2011 08:09:48 +0000 (21:09 +1300)]
Bug 6679 : Allowing eval require
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Chris Cormack [Wed, 2 Nov 2011 02:55:00 +0000 (15:55 +1300)]
Bug 6679 : Adding license statement and stopping declaring variables in a conditional
Chris Cormack [Mon, 31 Oct 2011 08:16:29 +0000 (21:16 +1300)]
Bug 6679 : cataloguing/ now passing critic tests
Declare variables outside of conditionals
Don't use prototypes http://www.modernperlbooks.com/mt/2009/08/the-problem-with-prototypes.html
Use ":encoding(UTF-8)" to get strict validation.
Paul Poulain [Thu, 8 Dec 2011 09:08:44 +0000 (10:08 +0100)]
Merge remote-tracking branch 'origin/master' into new/bug_6679
Conflicts:
catalogue/showmarc.pl
Chris Cormack [Mon, 31 Oct 2011 08:02:13 +0000 (21:02 +1300)]
Bug 6679: catalogue/ now passing perl critic tests
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Wed, 7 Dec 2011 17:07:40 +0000 (18:07 +0100)]
Merge remote-tracking branch 'origin/new/bug_5604'
Chris Cormack [Tue, 6 Dec 2011 21:17:12 +0000 (10:17 +1300)]
Bug 5604 : Follow up for missing image
When doing icons, there is a test for them please run
perl xt/author/icondirectories.t
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
see jenkins complaining: http://jenkins.koha-community.org/job/Koha_master/lastUnstableBuild/#showFailuresLink
Paul Poulain [Wed, 7 Dec 2011 17:04:10 +0000 (18:04 +0100)]
Jenkins complaining = fixing number of tests
(see jenkins build http://jenkins.koha-community.org/job/Koha_master/557/#showFailuresLink)
Paul Poulain [Wed, 7 Dec 2011 15:38:39 +0000 (16:38 +0100)]
Merge remote-tracking branch 'origin/new/bug_5327'
Paul Poulain [Wed, 7 Dec 2011 15:37:31 +0000 (16:37 +0100)]
t/UploadedFile, updated comment
Chris Cormack [Tue, 6 Dec 2011 21:09:43 +0000 (10:09 +1300)]
Bug 5327: Fixing the Members.t test
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Confirm Members.t tests complete
Chris Cormack [Tue, 6 Dec 2011 20:17:35 +0000 (09:17 +1300)]
Bug 5327 : Fixing unit test for SQLHelper.pm
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Confirm that all SQLHelper tests pass.
Chris Cormack [Sun, 4 Dec 2011 07:02:45 +0000 (20:02 +1300)]
Bug 5327 : Complete coverage for BackgroundJob.pm
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tests run without problems.
Chris Cormack [Sun, 6 Nov 2011 06:59:34 +0000 (19:59 +1300)]
Bug 5327 : Adding more unit tests
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
New tests run without problems.
Chris Hall [Mon, 21 Nov 2011 23:19:55 +0000 (12:19 +1300)]
Bug 5327: Unit tests for C4/Exteral/BakerTaylor.pm
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Maxime Pelletier [Tue, 20 Sep 2011 22:01:23 +0000 (18:01 -0400)]
fix test xml records
http://bugs.koha-community.org/show_bug.cgi?id=5327
Paul Poulain [Wed, 7 Dec 2011 15:03:16 +0000 (16:03 +0100)]
Merge remote-tracking branch 'origin/new/bug_6291'
Owen Leonard [Tue, 6 Dec 2011 17:50:57 +0000 (12:50 -0500)]
Bug 6291 - Cart printing truncated in Firefox
Alternate fix suggested by http://www.sidesofmarch.com/index.php/archive/2007/04/25/firefox-truncates-long-tables-when-printing/
Seems absurd that changing the top heading from an <h1> to an <h2>
would fix the problem, but it does in my tests in Firefox 3.6 and 8
on Windows 7
Paul Poulain [Wed, 7 Dec 2011 15:01:27 +0000 (16:01 +0100)]
Revert "Fix for Bug 6291, Cart printing truncated in Firefox"
This reverts commit
da0a5b2bd63027102dd61789fc455941e237abc9.
Paul Poulain [Wed, 7 Dec 2011 14:58:38 +0000 (15:58 +0100)]
Merge remote-tracking branch 'origin/new/bug_6971'
Paul Poulain [Wed, 7 Dec 2011 14:17:54 +0000 (15:17 +0100)]
Test suite: ignoring backups from vi (files ending with a ~)
On my laptop, this test was failing because some scripts had a conflict marker in a backup ... of a conflict I just fixed!
ignoring any file ending with a ~
Paul Poulain [Wed, 7 Dec 2011 14:16:19 +0000 (15:16 +0100)]
history.txt, adding Stéphane Delaune, as 117, moving others and welcome Albert, you're 163th !
Jared Camins-Esakov [Fri, 2 Dec 2011 00:53:51 +0000 (19:53 -0500)]
Bug 6971: XSLT Intranet Detail displays 245 subfields out of order
245 Subfields in the Intranet Detail Display (MARC21slim2intranetDetail.xsl) are
being reordered on display. Instead of displaying 245$a 245$h 245$b, the
stylesheet was displaying 245$a 245$b 245$h. This patch does not address ISBD
punctuation.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Follow-up patch to address the issue in the staff client.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Albert Oller [Fri, 18 Nov 2011 18:49:07 +0000 (13:49 -0500)]
Bug 6971: XSLT Opac Detail displays 245 subfields out of order.
245 Subfields in the OPAC Detail Display (MARC21slim2OPACDetail.xsl) are being
reordered on display. Instead of displaying 245$a 245$h 245$b, the stylesheet
was displaying 245$a 245$b 245$h. This patch does not address ISBD punctuation.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Clarified commit message.
Mason James [Thu, 22 Sep 2011 09:48:04 +0000 (21:48 +1200)]
Bug 6908 - increase DEBUG level for *NOISY* Dates.pm init() messages
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Tue, 6 Dec 2011 19:34:55 +0000 (20:34 +0100)]
Adding Adrien Saurat as 161th committer.
Adrien Saurat [Fri, 4 Nov 2011 13:20:31 +0000 (14:20 +0100)]
Bug 6893 : Updates suggestions list when adding orders
A suggestion added through addorder.pl now changes
to the ORDERED status as initially intended (but so
far it stayed as ACCEPTED).
This fixes the list of potential suggestions to order,
the ORDERED ones don't appear anymore.
Bug 6893 : Follow-up: Disabled WHERE clause excluding ORDERED status
In SearchSuggestions, a WHERE clause was excluding the ORDERED
suggestions from the results. Now replaced with 1=1.
(before 6893 correction, the WHERE clause was excluding the
STATUS='CLAIMED' suggestions, but this status cannot be found anywhere
else in the code... so I changed to STATUS='ORDERED' which
seemed more accurate, but it had impacts on OPAC and some Admin tabs)
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Both patches applied cleanly, sqashed them together after testing.
Tested:
1) Creating new suggestions
- from OPAC, shows up in patron account as 'requested', pending in staff
- from staff, shows up in list of pending suggestions
Status in database is ASKED
Note: suggestions made from staff for the same patron have suggestedby = 0
in the database, so are not showing up in the patron account. Is this by
intention? (if not, I think this is a separate bug)
2) Accepting suggestions
- from list
- from edit page
Status in database is ACCEPTED
Patron account shows 'Accepted by the library (Bestseller)'
Note: after changing the status from the list, bug 4068 kicks in and
some tabs and even suggestions are hidden. Going back to the acq start
page and going back to the suggestions page from there helps.
3) Rejecting suggestions
- from list
- from edit page
Status in database is REJECTED
Patron account in OPAC shows 'Suggestion declined'
Note: bug 4068 again.
4) Ordering from suggestions
- new basket
- ordered 2 accepted suggestions
SUCCESS! Great improvement:
- Status in database is now ORDERED
- Already ordered suggestions no longer show up on list of
suggestions to order from.
- Patron account shows 'Ordered by the library (Bestseller)'
- Suggestion management page shows a new tab 'Ordered'
- For the suggestion with a valid 'suggestedby' borrowernumber,
a mail was generated. (bug 7094)
5) Receive ordered suggestions
- received my ordered suggestions
This is is not in the scope of this bug, but for documentation:
- No message was generated to inform the patron
- Status stays ORDERED
- Patron account still shows item as ordered, no change to 4)
Looking at the suggestion.tt I think there should be another status
AVAILABLE.
216 [% ELSIF (suggestion.suggestiontypelabel == "Available") %]Available
Signing off, fixes bug reported. Danke!
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Tue, 6 Dec 2011 19:05:25 +0000 (20:05 +0100)]
Bug 6530 follow-up for fix Item_Due / Item_DUE in message_attributes
also dealing with existing setups
Katrin Fischer [Sun, 20 Nov 2011 21:31:47 +0000 (22:31 +0100)]
Bug 6530: Item Due notice label displaying as 'unknown'
Some of the translated sql files still had 'Item_DUE' instead
of 'Item_Due' causing the staff interface to display 'unknown'
instead of the correct description.
To test:
- Do a new installation, using German, French, Polish, Russian or Ukrainian sample files.
- Actived EnhancedMessagingPreferences
- Create a new patron category and check message descriptions display correctly
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Dobrica Pavlinusic [Thu, 31 Mar 2011 13:14:46 +0000 (15:14 +0200)]
Bug 6022: Auth_with_ldap check if categorycode is valid
When importing users from LDAP, Auth_with_ldap.pm doesn't check if value for
categorycode is present in categories table in Koha resulting in referential
integrity error instead of using default value from koha-conf.xml
Test scenario:
1. enable LDAP in koha-conf.xml using <useldapserver>1</useldapserver>
and add <ldapserver> configuration with
<categorycode is="SomeLDAPField">DefaultCategoryCode</categorycode>
2. select/create LDAP user with category in SomeLDAPField which isn't in
Koha
3. try logging in and ensure that assigned category to new user is
DefaultCategoryCode
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Tue, 6 Dec 2011 18:46:55 +0000 (19:46 +0100)]
Merge remote-tracking branch 'origin/new/bug_5604'
Chris Nighswonger [Thu, 6 Oct 2011 17:23:23 +0000 (13:23 -0400)]
Fixing typo in image filename which introduced a space causing problems on win32
http://bugs.koha-community.org/show_bug.cgi?id=5604
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Adrien Saurat [Fri, 2 Dec 2011 09:46:29 +0000 (10:46 +0100)]
Bug 4051: adds issuedate column to overdues export
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Owen Leonard [Thu, 13 Oct 2011 18:44:18 +0000 (14:44 -0400)]
Bug 3385 - Add checkout date and renewal date to display list of checked out items
This patch doesn't fix the origial request to add the renewal date
to the list of checked out items, but follows the other bug commenter's
suggestion that the information be added to the item details page
(moredetail.pl).
The other part of this request, to add the checkout date, has already
been fixed by another patch.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Tue, 6 Dec 2011 18:13:55 +0000 (19:13 +0100)]
Bug 2346 follow-up (UpdateBorrowerDebarred subroutine removed)
notifyMailsOp.pl is deprecated : is was written by and for Ouest Provence (thus the OP) and is not used anymore.
it's probably not working anymore.
Removing the script
Ian Walls [Sun, 4 Dec 2011 17:19:29 +0000 (12:19 -0500)]
Bug 2346: Remove C4::Overdues::UpdateBorrowerDebarred in favour of C4::Members::DebarMember
Removes now-unused subroutine from C4::Overdues, as well as the db_dependent unit test
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Mon, 5 Dec 2011 06:18:21 +0000 (07:18 +0100)]
Bug 6740: can add items at ordering/receiving but not remove
The problem was, that the script was looking for the first
and second <a> tag in the code. When using plugins in the framework
this can't work. The patch changes the script to select the correct
<a> tags by using a class.
Also changes + and - to 'Add' and 'Delete' to make the meaning clearer
and clicking on them a bit easier.
To test:
1) AcqCreateItem = order
- Create a basket
- Create an order line
- Create more than one item
- Delete items
- Check quantity is calculated correctly
- Check items are created correctly
2) AcqCreateItem = receive
- Create basket
- Create 2 order lines, order >1 items
- Do a partial item by removing items from the receive form
- Receive all missing items
- Receive more items than ordered
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Alex Arnaud [Fri, 2 Dec 2011 08:19:33 +0000 (09:19 +0100)]
bug/7285 Use C4::Auth::checkpw instead of checkpw only
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Owen Leonard [Wed, 30 Nov 2011 17:50:35 +0000 (12:50 -0500)]
Bug 7280 - can't place hold without selecting on list
JavaScript was looking for clicks on links with class "hold,"
and incorrectly triggering the check for checked checkboxes.
Making the selection stricter lets the JS function as it should
while allowing people to place individual holds directly.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Frédérick Capovilla [Mon, 21 Nov 2011 17:28:25 +0000 (12:28 -0500)]
Bug 7251 : Corrects a problem in overdue_notices.pl when delimiter is set to tabulation
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
checked that others values for the separator are OK = it is (space, semicolon,... see syspref "delimiter")
Owen Leonard [Tue, 15 Nov 2011 17:01:19 +0000 (12:01 -0500)]
Bug 7225 - "Delete all items" should be greyed out when a title has no items
This patch changes the catalog toolbar so that when there are no
items attached to a record the "Delete all items" menu item appears
to be disabled. Clicking it will trigger an alert, "This record
has no items."
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Jared Camins-Esakov [Sat, 12 Nov 2011 00:53:14 +0000 (19:53 -0500)]
Bug 7216 - koha-restore does not correctly set home
Prior to this patch, the koha-restore Debian script did not set the home
directory properly for the system users it created, causing problems down the
line for koha-rebuild-zebra. This patch fixes that by specifying the home
directory.
http://bugs.koha-community.org/show_bug.cgi?id=7216
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Frédérick Capovilla [Wed, 2 Nov 2011 14:56:33 +0000 (10:56 -0400)]
Fix a problem when translations contain various XSL files
With new 3.6.1 translation files, the lake of 'nbsp' entity definition make
fail t/00-valid-xml.t test.
This patch applies to HEAD and 3.6.x.
How to test:
- checkout 3.6.x branch
- generate French templates:
cd misc/translator
./translate install fr-FR
cd ../..
- run test:
prove -v t/00-valid-xml.t
you get failing error message
- apply this patch
- run test again: it passes
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
http://bugs.koha-community.org/show_bug.cgi?id=7141
Owen Leonard [Wed, 2 Nov 2011 14:08:25 +0000 (10:08 -0400)]
Fix for Bug 7137 - fixed width table where it should be variable
Removing inline style setting the table width.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Liz Rea [Mon, 31 Oct 2011 21:16:34 +0000 (16:16 -0500)]
Bug 7122 - Add a div to opac-messaging.tt to facilitate consistent styling across OPAC user pages.
To test:
verify that the div <div class="yui-g" id="usermessaging"> appears and can be styled via opacusercss.
Signed-off-by: Arslan Farooq <arslanone@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Tue, 6 Dec 2011 11:07:48 +0000 (12:07 +0100)]
160th developer + 2 events added (NZ tm and 3.6.1 released)
Owen Leonard [Mon, 31 Oct 2011 15:01:35 +0000 (11:01 -0400)]
Fix for Bug 7120 - After deleting order from order receive page redirect fails
The order modification script doesn't retrieve an order's basket
when doing a delete, so the template must explicitly pass
the basket number if we want the redirect to work.
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Martin Renvoize [Fri, 28 Oct 2011 14:30:39 +0000 (15:30 +0100)]
Bug7108: Intranet Language Menu Display Patch
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Martin Renvoize [Thu, 27 Oct 2011 16:58:28 +0000 (17:58 +0100)]
Bug 7108 - OPAC Translations Display Patch
If multiple similar languages (i.e: fr-FR, fr-CS or en, en-GB) are installed
and the opaclanguagesdisplay preference is set to allow patrons to choose a
language then at each occurrence of a language with multiple options the
display is the selector splits across multiple lines breaking the display.
http://bugs.koha-community.org/show_bug.cgi?id=7108
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Marcel de Rooy [Sun, 4 Dec 2011 16:29:05 +0000 (17:29 +0100)]
Bug 6786: Follow up fixing index names with hyphens
Adds hyphen to regex looking for index names in buildQuery.
Test by searching on Control-number=...
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Henri-Damien LAURENT [Thu, 3 Mar 2011 11:02:38 +0000 (12:02 +0100)]
Bug 6132: preference were case sensitive.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Tue, 6 Dec 2011 10:36:57 +0000 (11:36 +0100)]
Merge remote-tracking branch 'origin/new/bug_5211'
Srdjan Jankovic [Fri, 2 Dec 2011 00:26:50 +0000 (13:26 +1300)]
bug_5211: LostItem() - added charge_fee param to control fee charging
Pass charge_fee = yes wherever is LostItem() called, which effectively
means tha there's no change.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Ian Walls [Sun, 4 Dec 2011 17:31:22 +0000 (12:31 -0500)]
Bug 2616: Remove unnecessary 'use HTML::Template' calls
Removes deprecated calls to HTML::Template or HTML::Template::Pro from:
C4/Output.pm
catalogue/export.pl
reports/issues_by_borrower_category.plugin
reports/itemtypes.plugin
Only remaining calls are in misc/cronjobs/rss/rss.pl, misc/cronjobs/smsoverdues.pl,
and t/test_template.pl. These scripts still legitimately depend on H:T:P
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Christophe Croullebois [Thu, 27 Oct 2011 13:50:19 +0000 (15:50 +0200)]
Bug 7105: Bad request in GetSubscriptions
If $string or $issn is passed to GetSubscriptions, the request is false.
See Bug 5864, especially the last comment from Frédérick Capovilla.
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Marcel de Rooy [Mon, 17 Oct 2011 07:28:38 +0000 (09:28 +0200)]
Bug 7041: Sort >1000 search results with sortmax parameter in zebra config file
By default, zebra does not sort more than 1000 records (search results). You
can increase this number by adding the sortmax parameter in zebra-biblios.cfg.
Putting this value in Koha's zebra config file will make this default value
visible and make it easier to increase it if one prefers that.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Robin Sheat [Wed, 12 Oct 2011 05:29:28 +0000 (18:29 +1300)]
Bug 7008 - create tmp dir for zebra
Sometimes zebra needs a tmp dir in order to work. This ensures that it
is created both by koha-create-dirs in the packages, and by
rebuild_zebra when it runs.
--
tested ok, signing off
Signed-off-by: Mason James <mtj@kohaaloha.com>
Jared Camins-Esakov [Mon, 10 Oct 2011 12:11:14 +0000 (08:11 -0400)]
Bug 6997: Koha-remove leaves system in inconsistent state
If you accidentally delete one of the files that koha-remove is supposed to
remove, when koha-remove reaches that point in the script, it will die, leaving
later removal steps undone. This patch fixes the problem by checking for the
existence of each file prior to deleting it, so that short of an actual problem
with removing the file, the script can continue. Note that the fix for bug 6929
is also needed to prevent any problems with stopping Zebra from killing
koha-remove.
Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>
Paul Poulain [Sat, 3 Dec 2011 06:52:07 +0000 (07:52 +0100)]
Merge remote-tracking branch 'origin/new/bug_6966'
Nicole C. Engard [Wed, 19 Oct 2011 23:04:57 +0000 (19:04 -0400)]
Bug 6966 Updated Patron Attribute Help File
A new patch required an additional line in this help
file.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Paul Poulain [Tue, 27 Sep 2011 13:13:01 +0000 (15:13 +0200)]
Bug 6926 : overdue_notices don't send itemcount to notification
In advanced_notices.pl you can return the number of due items using <<count>>
flag.
If you use this flag in overdue_notices, it does not work, no number is
displayed.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Greg Barniskis [Mon, 26 Sep 2011 16:15:06 +0000 (11:15 -0500)]
Bug 6914 - fixes for the color option of koha_perl_deps.pl
Reset the terminal color mode after reporting (to avoid polluting the
user's shell), and use blue instead of white for the report header and
footer.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Sat, 3 Dec 2011 06:43:15 +0000 (07:43 +0100)]
Bug 6699 follow-up
The warn $error will issue this message if there is a message.
It's because how warn $blabla works : it does not work, you have to add ""
Marcel de Rooy [Wed, 10 Aug 2011 13:23:07 +0000 (15:23 +0200)]
6699 Add not-empty check for warnings from load_sql in Installer
Eliminates fake warnings "Something is wrong on line 530".
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Paul Poulain [Sat, 3 Dec 2011 06:36:44 +0000 (07:36 +0100)]
Merge remote-tracking branch 'origin/new/bug_5974'
Katrin Fischer [Sun, 27 Nov 2011 13:52:22 +0000 (14:52 +0100)]
Bug 5974: Fix broken toolbar on paton checkout tab
Fixed a couple of errors:
- [% CAN_user_staffaccess %] should be [% IF ( CAN_user_staffaccess ) %]
- added missing [% END %]
- added missing line new YAHOO.widget.Button("duplicate");
To test:
1) Open patron account
2) Go through tabs, especially 'Check out'
3) Check toolbars are correct and buttons work
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Fri, 2 Dec 2011 16:31:41 +0000 (17:31 +0100)]
Bug 6015, new script for load testing
This benchmark_staff.pl script is based on the previous benchmark_circulation.pl script
As it does not test only circulation, the renaming was necessary.
The script has many enhancement compared to the benchmark_circulation.pl one
The benchmark_staff will run a benchmark on the following pages:
* mainpage.pl
* catalogue/detail.pl
* catalogue/search.pl
* members/member.pl (search on a name)
* members/member.pl (search on a 1st letter)
* circulation/circulation.pl and return.pl (check-out and check-in)
* all those steps at the same time
run the script without any parameter to get syntax
Paul Poulain [Wed, 30 Nov 2011 16:12:06 +0000 (17:12 +0100)]
Revert "Fix for Bug 6291, Cart printing truncated in Firefox"
see
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6291, comment 7, 9 and http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7279
This reverts commit
da0a5b2bd63027102dd61789fc455941e237abc9.
Paul Poulain [Wed, 30 Nov 2011 16:07:29 +0000 (17:07 +0100)]
Merge branch 'new/bug_6328'
Paul Poulain [Wed, 30 Nov 2011 13:53:48 +0000 (14:53 +0100)]
Bug 7272 setting NULL to debarred field, to avoid having 0000-00-00
0000-00-00 can come only from a problem in the 3.06.00.001 update
Paul Poulain [Mon, 28 Nov 2011 11:20:58 +0000 (12:20 +0100)]
Merge remote-tracking branch 'origin/new/bug_6894'
Paul Poulain [Mon, 28 Nov 2011 11:13:42 +0000 (12:13 +0100)]
fixing the translatable-template.t to handle localized setups
Depending on your locale, msgmerge will return a different messages, enclosed in .... and .
The flow is not utf8 compliant, so this patch switches to testing "..... anything." instead of ".... word."
Now the test work on my (french setup)
Chris Cormack [Mon, 7 Nov 2011 02:30:20 +0000 (15:30 +1300)]
Bug 7268: Fixing failing tests for translatable templates
To test run
perl xt/author/translatable-templates.t
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test runs without any complaints about the fixed templates now.
Also checked detail pages without XSLT turned on display correctly.
Katrin Fischer [Tue, 25 Oct 2011 15:38:04 +0000 (17:38 +0200)]
Bug 6894: Order from suggestion defaulting to wrong currency
This problem turned out to be a bit different, than I initally thought.
This patch fixes the currency selections for new orders created in staff.
Before this patch, the first currency in the list was selected instead
of the active currency. So you needed to change it explicitly.
After patch it should work like this:
1) Suggestion created in OPAC - currency defaults to NULL in database
2) Editing a suggestion created in OPAC will default to active currency.
3) Creating a new suggestion in staff will default to active currency.
4) When ordering, the currency will default to the vendor currency, if no
currency is set in the suggestion. (still happens, when suggestions are accepted
in batch from the list.
I hope this is right - comments and testing appreciated.
Signed-off-by: Liz Rea <lrea@nekls.org>
Verified that in the above places, active currency was displayed or selected. Tested both suggestions entered from the OPAC and from the intranet.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Verified the existence of the bug, and that the fix works as advertised.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Mon, 28 Nov 2011 09:12:23 +0000 (10:12 +0100)]
Merge branch 'new/bug_6328'
Chris Cormack [Sun, 27 Nov 2011 07:30:49 +0000 (20:30 +1300)]
Bug 6328 : Previous patches broke templates, this is fixing them
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes xt/tt_valid.t
Checked the member entry page, didn't find any problems.
Chris Cormack [Fri, 25 Nov 2011 18:39:51 +0000 (07:39 +1300)]
Bug 6628 : Stopping a potential vulnerability
Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- verified help pages still work
- verified /cgi-bin/koha/help.pl?url=koha/../catalogue/advsearch.pl does not
show the template file (did work on master, not after applying patch)
- verified cgi-bin/koha/help.pl?url=koha/../../../../../../etc/passwd%00.pl does not work (didn't work on master or after applying patch)
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
The potential vulnerability would allow anyone to see the content of any .tt file, and .tt only. Was much less critical than the vulnerability for 6629, but it's worth fixing !
Paul Poulain [Mon, 28 Nov 2011 08:46:23 +0000 (09:46 +0100)]
Merge branch 'new/bug_6629'
Chris Cormack [Sun, 27 Nov 2011 08:58:04 +0000 (21:58 +1300)]
Bug 6629 : Follow up, sanitising in a couple more places
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Chris Cormack [Sun, 27 Nov 2011 08:18:29 +0000 (21:18 +1300)]
Bug 6629 : Follow up to trap vuln in webinstaller and fixing the error
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch fixes problem occuring in web installer.
Paul Poulain [Fri, 25 Nov 2011 13:29:04 +0000 (14:29 +0100)]
Merge remote-tracking branch 'origin/new/bug_7250'
Katrin Fischer [Mon, 21 Nov 2011 06:54:15 +0000 (07:54 +0100)]
Bug 7250: stage_biblios_file.pl is missing options for encoding
- adds command line options for encoding, defaulting to utf8
- options match options availablen in the stage marc records form
of the staff interface
- activates warnings
- adds copyright statement
To test:
Import records with diacritics using the stage_biblios_file.pl
Records can be imported into the catalog using the staff interface
or the commit_biblios_file.pl script.
Signed-off-by: Ulrich Kleiber <ulrich.kleiber@bsz-bw.de>
Successfully tested with default encoding utf8.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Colin Campbell [Sat, 17 Sep 2011 11:45:09 +0000 (12:45 +0100)]
Bug 6877 - use is executed and errors at compile time
Although use is being called in an eval it will still be executed
at compile time so that an error can cause the script to abort before
the eval is executed. The eval expression syntax is not checked
so eval block should be preferred.
Use require/import which execute at runtime which is the intention
here.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
checked that, with Libravatar OK things are still OK
Paul Poulain [Fri, 25 Nov 2011 13:09:06 +0000 (14:09 +0100)]
bug 6328: updatedatabase bump
Paul Poulain [Fri, 21 Oct 2011 15:23:36 +0000 (17:23 +0200)]
Bug 6328 Fixes for comment 35
* correctly indenting with tab the debarrcomment field
* setdebar.pl is called without status parameter, thus it is not working anymore. It's fixed & some dead code has been removed. To test : debar someone, then go to patron detail page and click "lift debarment"
* the test function had not been updated. The fix define a debarment date of 2099-12-31 (no limit)
Paul Poulain [Tue, 11 Oct 2011 16:22:27 +0000 (18:22 +0200)]
Bug 6328 follow-up for QA comments
* fixed documentation in C4/Auth_with_ldap.pm
* updated ILSDI/Utility.pm to work with debarred being a date
* updated Members.pm/patronflags to work with debarred being a date (copy/paste of BibLibre code that had not been backported)
* fixed opac-reserve to check correctly for debarred status
I also have removed a duplicate line on circulation.pl when the patron was restricted = the information was displayed twice
Paul Poulain [Wed, 11 May 2011 14:54:56 +0000 (16:54 +0200)]
Bug 6328 fine in days does not work
Some code coming from BibLibre has been lost in the process of inclusion in
3.4. The result is that fine in days does not work at all (you can setup rules,
but it does nothing)
Step to reproduce:
- Koha > Admin > circ rules > set 1 day fine every day of overdue for default
rule
- Issue a book return date last week
- check-in the book => no debarment is set
The following patch will fix all of those problems by :
* updating borrowers.debarred to a date field (instead of tinyint). It contains
the limit of the debarment
* changing API of DebarMember and UpdateBorrowerDebarred to pass a date
* display debarrdate where applicable. Note that a debarrdate of 31/12/9999 is
considered as unlimited and not displayed
* added a debarrcomment, usefull to explain why a patron is debarred (this is
independant from debarrdate changes and can be used when placing an unlimited
debarment too)
[2011-05-12] F. Demians. It works as described. And I can confirm this
functionality is impatiently awaited by French libraries since one year. Thanks
BibLibre for the good work and for contributing this code.
Bug 6328 Followup--update DB structure
Thanks Katrin.
Bug 6328: make comment a textbox / fix debar by notice trigger
Debarring by notice triggers was broken, because the new function
expects a date as second parameter.
The comment field in patron account details was a very long text field.
Patch changes it to be a textbox instead.
Bug 6328: Lift debarment leaves patron account
'Lift debarment' redirects to an empty circulation page.
BZ6328 follow-up 3
Fixes comment 23 from Fernando L. Canizo : when the patron was debarred and debar removed
he still could not check-out.
The changes in the IsMemberBlocked (that were on biblibre/master) were lost somewhere
The sub was still checking for old_issues instead of calling CheckBorrowerDebarred
to get a debardate if applicable
Note : this bug was appearing only is you had issuing rules defined for itemtype/categorycode/branch.
Seemed to work if you had only default rules. That's probably why it hadn't been spotted before
BZ6328 follow-up 4
Comments fron Zeno Tajoli: The patch is OK and I sign-off it. Two little changes done on
installer/data/mysql/kohastructure.sql and installer/data/mysql/updatedatabase.pl
Signed-off-by: koha <koha@kohabase.localdomain>