Commit graph

15114 commits

Author SHA1 Message Date
Galen Charlton
18e06ecf0b bug 7198: show patron name in overdue list even if name column is null
If the surname or firstname of a patron is NULL, the MySQL concat()
function (properly) returns NULL, leading to the patron name not
displaying in the overdue report.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-12 16:32:13 +01:00
Liz Rea
4fad65cc26 Bug 7159 - Add branchcode to circulation.pl search (take two, revising with Owen's suggestion)
I know there's talk of getting rid of this patron search method, but I had a
request for this and so here it is.

To test:
verify that branchcode is displayed on patron search results from
circulation.pl.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-12 15:50:25 +01:00
a98219dc34 Fix for Bug 7124 - back to search wrapping in lower resolutions
Maybe not a complete fix, but hopefully an improvement. I couldn't
prevent it from wrapping at smaller browser widths, but I was
able to change the style so that when it does wrap it's a little
more readable.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-12 15:35:01 +01:00
Frère Sébastien Marie
48173560ba Bug 7316 - Missing escaping in search results
Two parameters are now escaped in title (html element):
 - query_desc
 - limit_desc

This is a security correction against XSS.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-09 16:01:23 +01:00
Paul Poulain
3dc9930001 Merge remote-tracking branch 'origin/new/bug_6679' 2011-12-09 09:51:40 +01:00
Paul Poulain
fe50ffb37f 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>
2011-12-09 09:49:22 +01:00
Paul Poulain
7e4e0d4300 updatedatabase: Adding missing \n at the end of 2 print
They were missing on bug 6530 and 6328
2011-12-09 09:39:38 +01:00
Robin Sheat
038a2cf5d6 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)
2011-12-08 17:49:53 +01:00
c1dbd7bbbf 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>
2011-12-08 17:36:37 +01:00
8f0c10ef1b 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>
2011-12-08 12:06:41 +01:00
d3c02c6bb6 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!
2011-12-08 12:04:28 +01:00
Katrin Fischer
5d6f770c18 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>
2011-12-08 11:52:59 +01:00
Paul Poulain
614cc4ca8d Welcome to jon Aker (#164) + missing tabs & "releases" 2011-12-08 11:26:02 +01:00
Jon Aker
90ddf1b254 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>
2011-12-08 11:24:14 +01:00
Colin Campbell
d39262e61d 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>
2011-12-08 11:19:10 +01:00
Paul Poulain
484c1f6dea Merge remote-tracking branch 'origin/new/bug_7141' 2011-12-08 11:05:35 +01:00
Chris Cormack
ce59911932 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>
2011-12-08 10:51:25 +01:00
Chris Cormack
7dbb966b49 Bug 6679 : Allowing eval require
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-08 10:25:14 +01:00
Chris Cormack
dc6e1031f8 Bug 6679 : Adding license statement and stopping declaring variables in a conditional 2011-12-08 10:11:27 +01:00
Chris Cormack
a047dea5e4 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.
2011-12-08 10:11:23 +01:00
Paul Poulain
b9d743a928 Merge remote-tracking branch 'origin/master' into new/bug_6679
Conflicts:
	catalogue/showmarc.pl
2011-12-08 10:08:44 +01:00
Chris Cormack
4a14e7dbe6 Bug 6679: catalogue/ now passing perl critic tests
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-08 10:05:48 +01:00
Paul Poulain
c0234dd9b9 Merge remote-tracking branch 'origin/new/bug_5604' 2011-12-07 18:07:40 +01:00
Chris Cormack
e615516952 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
2011-12-07 18:04:59 +01:00
Paul Poulain
e06f3ee0fa Jenkins complaining = fixing number of tests
(see jenkins build http://jenkins.koha-community.org/job/Koha_master/557/#showFailuresLink)
2011-12-07 18:04:10 +01:00
Paul Poulain
2e486be592 Merge remote-tracking branch 'origin/new/bug_5327' 2011-12-07 16:38:39 +01:00
Paul Poulain
ffb544e8e4 t/UploadedFile, updated comment 2011-12-07 16:37:31 +01:00
Chris Cormack
94e1691a74 Bug 5327: Fixing the Members.t test
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Confirm Members.t tests complete
2011-12-07 16:17:11 +01:00
Chris Cormack
dbe36a2bf3 Bug 5327 : Fixing unit test for SQLHelper.pm
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Confirm that all SQLHelper tests pass.
2011-12-07 16:17:10 +01:00
Chris Cormack
19d071910f Bug 5327 : Complete coverage for BackgroundJob.pm
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tests run without problems.
2011-12-07 16:17:08 +01:00
Chris Cormack
a9bbeae6cc Bug 5327 : Adding more unit tests
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
New tests run without problems.
2011-12-07 16:17:07 +01:00
Chris Hall
16c51d0376 Bug 5327: Unit tests for C4/Exteral/BakerTaylor.pm
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-12-07 16:17:05 +01:00
Maxime Pelletier
d2c101a8a9 fix test xml records
http://bugs.koha-community.org/show_bug.cgi?id=5327
2011-12-07 16:17:03 +01:00
Paul Poulain
f21577986f Merge remote-tracking branch 'origin/new/bug_6291' 2011-12-07 16:03:16 +01:00
b03cb0d545 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
2011-12-07 16:01:43 +01:00
Paul Poulain
39d401a0ce Revert "Fix for Bug 6291, Cart printing truncated in Firefox"
This reverts commit da0a5b2bd6.
2011-12-07 16:01:27 +01:00
Paul Poulain
bedb9bef4c Merge remote-tracking branch 'origin/new/bug_6971' 2011-12-07 15:58:38 +01:00
Paul Poulain
13f29dd7f3 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 ~
2011-12-07 15:17:54 +01:00
Paul Poulain
046c1cab8c history.txt, adding Stéphane Delaune, as 117, moving others and welcome Albert, you're 163th ! 2011-12-07 15:16:19 +01:00
Jared Camins-Esakov
6f043aa82f 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>
2011-12-06 20:42:23 +01:00
Albert Oller
d71e696567 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.
2011-12-06 20:42:16 +01:00
924ce3697d 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>
2011-12-06 20:38:08 +01:00
Paul Poulain
a48660d4ca Adding Adrien Saurat as 161th committer. 2011-12-06 20:34:55 +01:00
Adrien Saurat
28ef6c199b 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>
2011-12-06 20:30:04 +01:00
Paul Poulain
4464a280ce Bug 6530 follow-up for fix Item_Due / Item_DUE in message_attributes
also dealing with existing setups
2011-12-06 20:05:25 +01:00
Katrin Fischer
30b6edc510 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>
2011-12-06 19:58:57 +01:00
Dobrica Pavlinusic
0352a8f24a 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>
2011-12-06 19:51:15 +01:00
Paul Poulain
aef1dd15fb Merge remote-tracking branch 'origin/new/bug_5604' 2011-12-06 19:46:55 +01:00
Chris Nighswonger
fa0bc2b08d 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>
2011-12-06 19:45:52 +01:00
Adrien Saurat
d4f4f88369 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>
2011-12-06 19:24:41 +01:00