Commit Graph

12703 Commits

Author SHA1 Message Date
Chris Nighswonger da2ea4a4d9 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>
(cherry picked from commit c1463e7255)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-14 08:16:36 -05:00
Owen Leonard 26c368fc8f 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>
(cherry picked from commit 0a26982378)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-14 08:16:18 -05:00
Galen Charlton 8dc027db12 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>
(cherry picked from commit 4cef5ec961)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-13 18:10:51 -05:00
Owen Leonard 4fed97397a 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>
(cherry picked from commit d9de6ebab3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-13 18:10:36 -05:00
Chris Nighswonger 8f2e2f07ac Updating Version Number to 3.02.00.007
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-13 13:17:18 -05:00
Owen Leonard 8e0b7a53d2 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>
(cherry picked from commit d9db65a17e83f64c5858c6fd7ad8dc0d1e7660ab)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-13 12:51:11 -05:00
Galen Charlton 7e49b79b73 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>
(cherry picked from commit 7a945dbc28)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-13 08:58:48 -05:00
Galen Charlton fcaee0d1f4 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>
(cherry picked from commit 3357d811ee)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-13 08:58:29 -05:00
Owen Leonard 41e99198db 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>
(cherry picked from commit d4f02c469b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-13 08:58:11 -05:00
Owen Leonard 8257c0eb63 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>
(cherry picked from commit fcb3668512)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-13 08:56:36 -05:00
Owen Leonard 1fa6ac5479 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>
(cherry picked from commit be54744836)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-13 08:56:18 -05:00
Owen Leonard 956ed669b7 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>
(cherry picked from commit 1586306866)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-13 08:56:02 -05:00
Colin Campbell 4d3888ce2c 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>
(cherry picked from commit bd93bfdbc4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-12 21:19:42 -05:00
Katrin Fischer 300bd7baba 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>
(cherry picked from commit d39dd6d857)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-12 21:19:32 -05:00
Katrin Fischer c7fa47668a 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>
(cherry picked from commit ed0ccd9f57)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-12 21:19:23 -05:00
Galen Charlton af37b7d4e6 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>
(cherry picked from commit 35d2008ef0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-12 21:14:35 -05:00
Colin Campbell 8912a613a5 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>
(cherry picked from commit 51eb4fa12e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-12 13:25:07 -05:00
Galen Charlton dab153a622 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>
(cherry picked from commit 11d54188f8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 20:46:08 -05:00
Owen Leonard 55cb2cf1c6 Fix for Bug 5075 - Terms not highlighted w/ xslt on
- XSLT didn't contain the class markup which acts as a hook
  for the JavaScript highlighting system.
- Standard results page also contained a typo which
  prevented data other than title and author from
  being highlighted

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
(cherry picked from commit b558c0db5a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 20:01:34 -05:00
Owen Leonard 6080451a35 Fix for Bug 5254 - no need to scroll left to right on acq z search
- Adding inline preview/import menu to match cataloging z39.50 search
- Improving behavior of inline menu on both pages
- Adding white space to ISBN/ISSN output on both pages to allow
  line breaks, improving table width and horizontal scrolling.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
(cherry picked from commit f987d35a22)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 20:00:55 -05:00
Nicole Engard 199e82d7d8 bug 5235 : circ receipt should include name
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
(cherry picked from commit ace0ce3f8d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 20:00:08 -05:00
Colin Campbell 519b2c03ef Bug 5315: Remove references to obsolete variable nbstatements
Trying to see the wood from the trees

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
(cherry picked from commit 9e5366734b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 19:59:52 -05:00
Galen Charlton 79e0f57153 bug 5309: tweak so that background progress doesn't exit immediately
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
(cherry picked from commit 48ab366b57)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 19:53:22 -05:00
Galen Charlton 14e76be09b fix use of outdated boilerplate
* New code *must* have an accurate copyright statement;
  it isn't 2000-2002 any more.
* Enable warnings in new code, don't do

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
(cherry picked from commit 0187e38ad7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 19:53:21 -05:00
Srdjan Jankovic 204ba1c125 bug 5309: Adjust progres bar
Also added some test facilities
wr73785

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
(cherry picked from commit e2e1dfd86e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 19:53:21 -05:00
Srdjan Jankovic ab774516fb bug5027: skip unticked checkboxes when submitting in the background.
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
(cherry picked from commit 3a4f36b002)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 19:53:21 -05:00
Chris Cormack fc78b73764 Bug 5385 - Fixing an error that crept in with the POD cleanup
(cherry picked from commit 9c6db56a3f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 19:48:15 -05:00
Galen Charlton 57b3924b9a 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>
(cherry picked from commit bcedff69bc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 19:48:15 -05:00
Colin Campbell c82169bc32 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>
(cherry picked from commit c95b5153e0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 19:48:15 -05:00
Andrew Elwell 7b7ee3303d 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>
(cherry picked from commit efa66f1f55)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 19:48:14 -05:00
Andrew Elwell 78a598f509 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>
(cherry picked from commit 9fa574f609)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 19:48:14 -05:00
Katrin Fischer e9877ebb4c 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>
(cherry picked from commit 63fdd8768a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 19:48:13 -05:00
Chris Cormack 77c39f6cfc Merge remote branch 'kc/new/bug_5386' into kcmaster
(cherry picked from commit af1d829031)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 12:52:41 -05:00
Chris Cormack 3b4cf45f9b 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>
(cherry picked from commit 7ecf2c2dc4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 12:52:36 -05:00
Chris Cormack 0fffa19267 Merge remote branch 'kc/new/bug_5105' into kcmaster
(cherry picked from commit 235cf872a5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 08:53:14 -05:00
Chris Cormack b2af1f850d Merge remote branch 'kc/master' into new/bug_5105
Conflict fixed

Conflicts:
	opac/opac-detail.pl
(cherry picked from commit dcb86689f7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-10 18:04:39 -05:00
Frédéric Demians 740070ab78 Fix bug on opac-detail.pl with switch statement
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5e1b8167c2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-10 17:17:42 -05:00
Katrin Fischer 99e8b01e9a 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>
(cherry picked from commit 863830f3f9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-10 17:17:42 -05:00
Galen Charlton 3393712a55 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>
(cherry picked from commit 2c794d1af7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-10 09:53:08 -05:00
Galen Charlton c35c0be961 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>
(cherry picked from commit daabd936d6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-10 09:53:07 -05:00
Chris Cormack 609a87f928 Ukranian and Russian syspref language updates
(cherry picked from commit 1aef81c354)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-08 19:16:35 -05:00
Chris Cormack d8c72a66f1 Russian and Ukranian opac language updates
(cherry picked from commit a3226d5ce6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-08 19:16:34 -05:00
Chris Cormack 07e5e31b60 Staff interface .po file updates
(cherry picked from commit 6d22b87543)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-08 19:16:34 -05:00
Katrin Fischer 9da96093f1 Bug 5370: Fix all references to koha.org
Thx to Brooke for helping with the wiki.

This is the last patch.
We will have to change some more links, after translate.koha.org was moved.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d829dc1c6a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-08 17:04:15 -05:00
Chris Cormack 37b759bf76 Merge branch 'trivial_bugs' of git://git.koha-community.org/wip/koha-fbc into kcmaster
(cherry picked from commit ce54fe0323)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-08 11:59:50 -05:00
Marcel de Rooy df3e806e28 Bug 4515 (Few very small errors in opac-search.pl) RESENT fixing whitespace warning
Loop on results should stop before $i==@servers.  Adding fix for warnings on undefined values in comparison for lines 485, 488 and 510.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a3ceef434e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-08 11:58:20 -05:00
Frédéric Demians b326530722 Bug 4472 Apply it to MARC21
For French installation of Koha using MARC21, the same issues as UNIMARC
affects handling of &nbsp; by translation scripts.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c616cb5081)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-08 00:48:35 -05:00
Owen Leonard 5ec46a6790 Fix for Bug 5214 - undefined itype images cause broken image icon in request.pl
Also fixes the same bug on the Itemtypes administration page.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fbbab73492)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-08 00:48:14 -05:00
Galen Charlton ef96483dab bug 5236: remove hidemytags from CSS as well
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c49600aaa7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-08 00:47:55 -05:00
Galen Charlton f84e17f18c bug 5219: tidy cleanup_database.pl
Includes a bit of cleanup of the enhancement patch
for bug 5074 - adding comments about old and new
behavior isn't necessary for such small changes.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 072896d66b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-08 00:47:40 -05:00