Commit graph

12962 commits

Author SHA1 Message Date
Chris Nighswonger
c1463e7255 Bug 5381 - Fines in notices prints always 0.00
This was due to passing off the biblionumber to GetFines rather than the itemnumber.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-14 22:25:03 +13:00
0a26982378 Additional fix for Bug 4423 - Staff Client XSLT is just a copy of the OPAC one
- Adding "Lists that include this title" links
 - Also correcting minor XHTML error in the same section of opac-detail.tmpl

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-14 19:23:53 +13:00
Chris Cormack
1edf825fa1 Merge remote branch 'kc/new/bug_4498' into kcmaster 2010-11-14 09:42:23 +13:00
4cef5ec961 bug 5400: new test case to find files with merge conflict markers
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-14 09:37:27 +13:00
d9de6ebab3 Fix for Bug 4498 - Acq always shows '1 suggestions waiting'
- Removing 'suggestions waiting' link from left-hand menu. A plain
  'suggestions' link is still shown if suggestions are enabled.
- Putting back the 'pending suggestions' box that used to appear
  on the Acquisitions home page. This will show, with a count
  of pending suggestions, only if suggestions are turned on and
  there are pending suggestions.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-14 09:34:45 +13:00
Chris Cormack
9ec8a89e51 Removing merge commit 2010-11-14 05:40:55 +13:00
7a945dbc28 bug 4359: make other pages in the OPAC respect noItemTypeImages
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-13 20:19:14 +13:00
3357d811ee bug 4359 follow-up: noItemTypeImages should just control image display
Tweaked so that the item type column is always displayed in the
checkout history in the OPAC; noItemTypeImages now just controls
whether the icon displays.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-13 20:19:13 +13:00
d4f02c469b Fix for Bug 4359, noItemTypeImages not active in OPAC
- Auth.pm put the noItemTypeImages preference under "intranet only."
  Moved it to "OPAC or intranet."
- Added check for the preference on the OPAC advanced search page.
- Improved logic for displaying images on the reading history page.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-13 20:19:12 +13:00
8663778b8e Bug 5396: New system preference UseTablesortForCirc
This system preference allows the librarian to toggle on or off whether the JQuery tablesort is used on the
circ/circulation.pl page.  For patrons with many checkouts, this sort may cause very slow page loading (and
therefore slow circulation transaction time), depending on the browser and local machine used.  Staff can
still see a sortable list of current checkouts on the members/moremember.pl page.

My revision prevents the template from including *any* tablesorter code if the
preference is feature is turned off: both the circulation list and
the holds list will have no jQuery tablesorter.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-13 19:53:12 +13:00
fcb3668512 Fix for Bug 3271, Missing message when adding to a list with no items selected
There is no visible Lists button to "attach" our warning to
as there is in the OPAC, so warning message is displayed via
a javascript alert.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-13 19:36:23 +13:00
be54744836 Partial fix for Bug 4924, Public/Internal notes missing in staff normal view
This fix adds only public notes. A div is added as a hook for styling

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-13 19:24:40 +13:00
1586306866 Fix for Bug 4933, Link to subfield's edit tab from subfield structure admin
- Also corrects framework display in the case of the default

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-13 19:20:30 +13:00
35d2008ef0 bug 5393 [SIGNED-OFF]: add test case to check well-formedness of XML/XSLT files
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-13 11:51:49 +13:00
Chris Cormack
46c953b04c Merge remote branch 'kc/new/bug_5059' into kcmaster 2010-11-13 11:33:45 +13:00
Chris Cormack
ddd4d443dd Merge remote branch 'kc/new/bug_5058' into kcmaster 2010-11-13 11:33:41 +13:00
3152938684 Bug 5059: Inconsistent use of ordering price and list price in vendor form
Changes Ordering price to List price and make spelling more consistent.

Patch originally send for 3.2, still applied to HEAD without conflicts.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-13 11:31:53 +13:00
Katrin Fischer
d39dd6d857 BUG 5058: small layout correction of vendor form
Rebased to HEAD, should also apply to 3.2

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-13 11:31:27 +13:00
Chris Cormack
f2ea320aad Merge remote branch 'kc/new/bug_4979' into kcmaster 2010-11-13 06:47:45 +13:00
Chris Cormack
5e95b28e4b Merge remote branch 'kc/new/bug_5392' into kcmaster 2010-11-13 06:47:26 +13:00
Colin Campbell
bd93bfdbc4 Bug 5392 Initialize vars used in building url strings
If no failures are to be added to the to the strings for redirect
the corresponding variables are undefined causing warnings
to be logged. Initialize them so that the error log is not
being filled with trivia.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-13 06:46:21 +13:00
Colin Campbell
51eb4fa12e Bug 4305: Add test case for ISBN-13 to ISBN-10 conversion
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-13 06:43:49 +13:00
ed0ccd9f57 Bug 4979: Acq: input fields for new record are too short
Patch rebased to HEAD, should also apply to 3.2

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-13 06:40:22 +13:00
11d54188f8 bug 5389: mark Business::ISBN as a required dependency
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-12 14:31:56 +13:00
Chris Cormack
061e05ca97 Merge remote branch 'kc/new/bug_4305' into kcmaster 2010-11-12 10:47:38 +13:00
Chris Cormack
9c6db56a3f Bug 5385 - Fixing an error that crept in with the POD cleanup 2010-11-12 10:42:19 +13:00
Chris Cormack
bd0e9e92a9 Bug 5385 - Fixing an error that crept in with the POD cleanup 2010-11-12 10:38:42 +13:00
bcedff69bc bug 4305: add a couple test cases for _isbn_cleanup
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-12 10:26:57 +13:00
Colin Campbell
c95b5153e0 Bug 4305 Improve code flow
Use the ISBN Object's method to format the string
rather than add extra code to do it
Clean up the code flow for clarity
Benchmarking shows its a bit faster too
Don't add to the number of Test::Perl::Critic warnings
 for no benefit

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-12 10:26:56 +13:00
Andrew Elwell
efa66f1f55 Bug 5385: POD Cleanups (part 2)
More podchecker cleanups to eliminate warnings / errors

Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-12 10:06:56 +13:00
Andrew Elwell
9fa574f609 Bug 5385: POD Cleanups (part 1)
working through the master branch to eliminate all
podchecker warnings/errors

Actual improvement to the quality of the POD will
come later (hopefully with assistance of others)

Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-12 10:06:55 +13:00
Katrin Fischer
63fdd8768a Bug 5112: Organisation does not show links to professionals
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-12 09:40:50 +13:00
Chris Cormack
af1d829031 Merge remote branch 'kc/new/bug_5386' into kcmaster 2010-11-12 06:41:25 +13:00
e3322f732e bug 5386: remove dep on Path::Class from t/00-load.t
File::Spec is a core module, Path::Class isn't; not yet
worth adding a new dependency.

Also some minor whitepace cleanup.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-12 06:40:02 +13:00
Chris Cormack
235cf872a5 Merge remote branch 'kc/new/bug_5105' into kcmaster 2010-11-11 21:33:48 +13:00
5ebb5d4f4c Bug 5105 Regression test for switch statement
Add a test identifying Perl scripts and modules using switch statements.
This test file follow Chris pre-hook naming convention in order to be
triggered for patch submissions.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-11 21:32:31 +13:00
Chris Cormack
7ecf2c2dc4 Test modules compile
Script to test modules compile, when used with a pre-commit hook this
can test before a commit

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-11 21:31:02 +13:00
Chris Cormack
dcb86689f7 Merge remote branch 'kc/master' into new/bug_5105
Conflict fixed

Conflicts:
	opac/opac-detail.pl
2010-11-11 11:33:10 +13:00
Colin Campbell
a9010530a3 Bug 5105 - Remove use of depreciated Switch module
Use of switch generates errors in perl 12 and above
Replaced uses of the Switch module by if- else constructs
Removed some mixed space+tab indentation around these where
it generated visual confusion

As of perl 10 you can use given/when constructs but this is not
supported in earlier perls.
2010-11-11 11:32:02 +13:00
5e1b8167c2 Fix bug on opac-detail.pl with switch statement
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-11 11:11:29 +13:00
Katrin Fischer
863830f3f9 Bug 5003: Can not search for organisation by name
Rebased to current HEAD, small error fixed.
Should also apply to 3.2

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-11 09:35:41 +13:00
2c794d1af7 bug 5380: remove copy-and-paste from authorities/detail.pl
MARC editor code not needed here.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-10 22:09:58 +13:00
daabd936d6 bug 5372: identify empty field in authority record correctly
This is the sibling to the fix for this bug for the bib
editor.  However, note that this change won't have a
direct effect yet, as currently you can't specify a
default value for a field or subfield in the authority
MARC frameworks.  See bug 4887.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-10 19:48:52 +13:00
89cda847a1 follow-up to reports permissions patch
* Enforce the requirement that the user must have the
  create_reports permission in order to delete a saved report;
  closes hole where unprivileged user could delete reports
  by constructing a URL maliciously
* Added another tweak of the template - don't offer option
  to create a new report if the user doesn't have permission.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-10 19:39:50 +13:00
Paul POULAIN
637e5c6713 MT4578 : remove edit & delete button if the user don't have edit/create report permission
(includes some reindenting, there are only a few <!-- TMPL_IF name="CAN_user_reports_create_reports" --> added

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-10 19:39:37 +13:00
Jean-André Santoni
4bd6188816 Fixes a permission problem in guided reports
missing s
create_reports
and execute_reports
rather than
create_report
and execute_report

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-10 19:39:23 +13:00
311d958bbb follow-up: improve use of home and holding library in circ stats report
[1] Actually make use of home/holding library if set
[2] Use current terminology - "library", not "branch"

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-10 19:39:03 +13:00
Alex Arnaud
51d4e749d5 (MT 3267) Add Homebranch and Holdingbranch search criterion on circulation stat.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-10 19:38:59 +13:00
d866282bb9 Removed two column definitions added in previous patch
The items table has neither a date_due nor issueddate
column.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-10 19:38:34 +13:00
Paul Poulain
84dbc926c0 MT2268 : Guided Reports Fix columns.def
Reports Guided : removing \n when reading columns.def
Adding some more fields to columns.def

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-10 19:38:03 +13:00