Commit Graph

12658 Commits

Author SHA1 Message Date
Galen Charlton be997f924e bug 4141: fix upgrade of OPAC XSLT parameters from 3.0.x
Note that OPACXSLTResultsDisplay and OPACXSLTDetailsDisplay
are boolean parameters in 3.2.x, not string parameters.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-04 06:54:04 +13:00
Chris Cormack 47391d4e5a Updating version number and fixing the xxx in updatedatabase ... my bad 2010-11-04 06:28:24 +13:00
Chris Cormack 78a1f58275 Merge remote branch 'kc/new/bug2567' into kcmaster
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-03 21:21:36 +13:00
Chris Cormack e5bdc1e9ab Merge remote branch 'kc/new/bug_5308' into kcmaster 2010-11-03 16:52:21 +13:00
Chris Cormack 5145eb59b7 Merge remote branch 'kc/new/merge_help' into kcmaster
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-03 14:58:52 +13:00
Chris Cormack ef087b0006 Merge remote branch 'kc/new/bug_4991' into kcmaster
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-03 14:49:13 +13:00
Chris Cormack ae6ae0b39d Merge remote branch 'kc/new/bug_5301' into kcmaster 2010-11-03 06:54:50 +13:00
dev2 433b77b750 Bug 5192 Enhancement to add new index for 658 curriculum field
Creates new curriculum index for 658 subfields a,b,c and search option in Advanced search (under More Options).  Also modifies the installer files to make 658abc display (they were hidden in the frameworks) and to create the new indexes.

The 658 already displays as part of the staff/OPAC subject display line.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 21:02:12 +13:00
Galen Charlton 9bd16d23b2 bug 5243: avoid crash when saving authority records on certain setups
This does not seem to occur on all platforms - C4::Search
exports SimpleSearch() by default - but adding the 'C4::Search::'
qualifier certainly doesn't hurt things.

Patch by Fridolyn Somers <fridolyn.somers@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 16:13:27 +13:00
Galen Charlton ba35ce60e1 bug 4991: follow-up tweaks
* make some strings translatable
* display library name instead of code in add/edit
  holiday panel
* minor textual fixes to hints

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-11-02 15:02:54 +13:00
Owen Leonard 1117f6920c Fix for Bug 4991, Overhaul of Calendar interface
- Put hints, key, and existing holidays into right column
- Style entry form for added clarity and consistency with other
  forms in Koha
- Change the way dynamically displayed hints are shown to better
  match existing static hints in Koha's interface
- Add branch name (instead of branch code) for clarity
- Add the ability to add and edit holiday titles (previously
  only description could be edited).
- Add links to the list of existing single-day holidays and
  exceptions which opens the calendar to that month/year

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-11-02 15:02:54 +13:00
Chris Cormack 5fa376542d Merge remote branch 'kc/new/bug_5162' into kcmaster 2010-11-02 14:41:07 +13:00
Galen Charlton 33f3d4de1d bug 5162: follow-up patch to not clear hidden input setting attribute type
Otherwise, can't saved new attributes set from a cloned
input or select control.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 14:40:10 +13:00
Owen Leonard 7564b21c32 Fix for Bug 5162, patron attributes 'new' link should create blank value
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 14:40:08 +13:00
Chris Cormack e979344ea9 Merge remote branch 'kc/new/for-3.4/enh_bulkmarcimport' into kcmaster 2010-11-02 14:38:52 +13:00
Chris Cormack f0fc240e91 Merge remote branch 'kc/new/for-3.4/spelling' into kcmaster 2010-11-02 11:33:49 +13:00
Nicole Engard 63536aecd9 bug 5050 move language prefs to I18N/L10N tab
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 11:20:04 +13:00
Nicole Engard a671da42a1 bug 5151 removed bolded terms in breadcrumbs
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 11:20:03 +13:00
Liz Rea 21cabf7666 bug 5237: Testing renewals on patron barcodes with + signs at the end
According to notes in bug, patch was originally by Chris Cormack.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 11:20:01 +13:00
Nicole Engard 9c1eae7453 bug 5163 change title of holds to pull page
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 11:19:56 +13:00
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
Owen Leonard 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
Owen Leonard 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
Marcel de Rooy 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
Galen Charlton 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
Galen Charlton 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
Galen Charlton 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
Galen Charlton 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
Owen Leonard 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
Owen Leonard 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
Galen Charlton 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
Galen Charlton 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
Galen Charlton 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
Galen Charlton 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
Galen Charlton 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