Commit graph

12839 commits

Author SHA1 Message Date
Nicole Engard
a8da1253ef bug 5258 change 'order' to 'order line' on receive page
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 11:19:55 +13:00
Colin Campbell
0089c9d229 Bug 5224 Remove the adjective Shopping from basket
New orders breadcrumbs were using the inappropriate term
Shopping basket whereas basket is used elsewhere

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 11:19:53 +13:00
Nicole Engard
ba85f5486c BUG 5239 add space between number and words in acq search
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 11:19:51 +13:00
f2e4fa7b1b Fix for Bug 5221 - Preselect tab containing itemtype/authval image in use
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 11:19:50 +13:00
Chris Cormack
9721610d91 Merge remote branch 'kc/new/bug_5236' into kcmaster 2010-11-02 11:10:39 +13:00
e7018d0eb6 Fix for Bug 5236 - "hide my tags" link does nothing
Removing the link. The suggested functionality doesn't
seem useful.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 11:08:28 +13:00
5c4f27bd0d Enhancement 5074 (Adding possibility to cleanup_database.pl to purge only older sessions) [UPDATED for master]
Currently, the misc/cronjobs script cleanup_database truncates the session table (deleting all records, including active sessions).
With an additional parameter sessdays, this behavior could be changed or (perhaps better) extended. If the parameter sessdays is passed along with a number of days, the script only deletes older session records. This is accomplished by examining the values of lasttime, atime or ctime in the record.
So, calling the script like:
  ./cleanup_database.pl -v -sessions -sessdays 7
will only delete sessions records older than 7 days. The "old style" call
  ./cleanup_database.pl -v -sessions
still works too and truncates the table as before.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 11:02:15 +13:00
Chris Cormack
4e11a5ade3 Merge remote branch 'galen/bug5308' into bug_5308 2010-11-02 08:52:43 +13:00
f88f88dcc5 bug 5301: improve escaping of XML characters in bib output
<, >, ', or " in an item call number will no longer make
the bib displays break when using XSLT mode.

Added a new routine to C4::Koha, xml_escape(), to implement
converting &, <, >, ', and " to their corresponding
entities.

Patch loosely based on work done by Daniel Latrémolière <daniel.latremoliere@bulac.fr>

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 08:31:47 +13:00
eb1a7e0691 bug 5318: fix value of r4 rank weight
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 08:26:28 +13:00
8893e38c6e remove unused template include
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 08:23:57 +13:00
20dce153b1 bug 5308: add foreign key constraints as well
Follows up on previous patch to require that routing
list entries be linked to subscriptions and patrons.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-11-01 08:23:35 -04:00
Srdjan Jankovic
653259e621 bug 5308: subscriptionroutinglist more strict
borrowernumber and subscriptionid NOT NULL, UNIQUE(subscriptionid, borrowernumber)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-11-01 08:10:15 -04:00
Chris Cormack
8af6165f53 Merge remote branch 'kc/new/background_jobs_tested' into kcmaster 2010-11-01 21:03:06 +13:00
Chris Cormack
c52225a599 Merge branch 'signoffs' into kcmaster 2010-11-01 20:52:42 +13:00
Chris Nighswonger
a1229d29b8 Bug 5227 [3.4] Enhance the label batch edit interface
This patch adds the ability to enter items into label batches via
barcode scanning

Work sponsored by Tamil - http://www.tamil.fr

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-01 20:43:30 +13:00
192e148fa3 Fix for Bug 5223, 'related subjects' should read 'subjects'
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-01 20:34:39 +13:00
3c36084b29 Fix for Bug 4261 - keyword mapping should show which framework the map is for
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-01 20:34:36 +13:00
b3fa9e36d3 history updates - recent releases
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-01 15:38:15 +13:00
7fd5071e67 bug 5327: follow-up to fix SIP tests
* removed t/SIP_SIPServer.t - despite the file name,
  C4/SIP/SIPserver.pm is not actually a module and
  cannot be 'used' or 'required'
* set module search path so that t/SIP_ILS.t and
  t/SIP_Sip.t will pass

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-01 15:35:52 +13:00
Katrin Fischer
e0892a5139 Bug 5327: More basic unit tests for C4 modules
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-01 15:35:50 +13:00
Chris Cormack
81d8ff20d6 History updates
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-01 15:32:39 +13:00
795ebedecd remove extraneous semicolon
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-01 08:49:22 +13:00
Brian Engard
1c4f479776 Updated links in Main Page Help
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-01 08:49:21 +13:00
Nate Curulla
cea1ef2720 Bug 5327: Add unit test for ItemType.pm
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-10-31 22:16:47 +13:00
3c91225a49 bug 2567: let 008/15-17 and 008/24-27 be set
Fixes bug where the MARC21 008 plugin was falsely
claiming that it set the illustration and nature of
contents positions by deriving it from other fields
in the bib records.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-10-31 15:41:22 +13:00
8640007ca0 tweak wording of merge target
Since the merge functionality is for merging biblio
records, not items, made the language more precise.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-10-31 10:54:29 +13:00
Nicole Engard
92de0f7eaf add missing help file for merging records
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-10-31 10:54:27 +13:00
Daniel Grobani
c45b18251e unit test stub for Z3950.pm
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-10-31 10:33:35 +13:00
Brian Engard
69037606f5 Create Unit Test for ImportBatch
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-10-31 10:32:29 +13:00
Chris Cormack
80be4c65e6 Merge remote branch 'kc/new/bug5075' into kcmaster 2010-10-30 20:32:45 +13:00
041207b5e2 bug 5146: patron import files require header row
Fixed help text on this point as well as options for
supplying dates in the input file.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-10-30 20:30:20 +13:00
Magnus Enger
d15790d9c5 Bug 5327: Add basic unit tests to some C4 modules
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-10-30 20:22:30 +13:00
Katrin Fischer
cc9a34c274 Bug 5327: Add basic unit tests to some C4 modules
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-10-30 20:12:53 +13:00
Nicole Engard
88acebeebe create unit test files
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-10-30 20:12:50 +13:00
Liz Rea
12f9aa973d Adding a simple test for Service.pm
At the advisement of the great Chris Cormack. (thanks for the lesson)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-10-30 20:12:47 +13:00
Robin Sheat
522a275905 Bug 5322 - Added pwgen dependency
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-10-30 20:03:53 +13:00
48ab366b57 bug 5309: tweak so that background progress doesn't exit immediately
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-26 12:14:46 -04:00
0187e38ad7 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>
2010-10-26 11:28:21 -04:00
Srdjan Jankovic
e2e1dfd86e bug 5309: Adjust progres bar
Also added some test facilities
wr73785

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-26 11:20:34 -04:00
Srdjan Jankovic
3a4f36b002 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>
2010-10-26 11:20:32 -04:00
b558c0db5a 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>
2010-10-26 09:26:58 -04:00
92c350fd60 Fix for Bug 5223, 'related subjects' should read 'subjects'
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-26 09:18:05 -04:00
Chris Nighswonger
3169100d51 Bug 5227 [3.4] Enhance the label batch edit interface
This patch adds the ability to enter items into label batches via
barcode scanning

Work sponsored by Tamil - http://www.tamil.fr

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-26 09:03:54 -04:00
65b5bdf8e1 Fix for Bug 4261 - keyword mapping should show which framework the map is for
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-26 08:55:48 -04:00
f987d35a22 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>
2010-10-26 08:48:15 -04:00
Nicole Engard
ace0ce3f8d bug 5235 : circ receipt should include name
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-26 08:39:54 -04:00
Colin Campbell
9e5366734b Bug 5315: Remove references to obsolete variable nbstatements
Trying to see the wood from the trees

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-26 08:39:18 -04:00
391ce2b469 bug 3211: fix some errors that crept into the cleanup
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-25 11:05:26 -04:00
dc6f654623 Further fixes for Bug 3211, cataloging value plugin forms should be valid XHTML
- Adding page heading
- Adding "Cancel" link to close popup
- Correctly marking up <label> <input> pairs
- Correctly escaping JavaScript blocks
- General markup corrections

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-25 09:55:02 -04:00