Commit graph

111 commits

Author SHA1 Message Date
c27139156b Some minor markup changes.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-01 18:59:21 -05:00
Joshua Ferraro
9e97a44417 Changing label from Overlay? to Match? since overlay is no longer
the only operation
2008-04-30 22:04:27 -05:00
Galen Charlton
438ed23337 staging import - enhance record overlay behavior
Enhanced the ability of catalogers to specify how
bib and item records should be added, replaced, or
ignored during a staging import.

When an import batch of bib records is staged and commit,
the user can now explicitly specify what should occur
when an incoming bib record has, or does not have, a match
with a record already in the database.  The options are:

if match found (overlay_action):
  create_new (just add the incoming record)
  replace (replace the matched record with the incoming one)
  use_template (option not implemented)
  ignore (do nothing with the incoming bib; however, the
          items attached to it may still be processed
           based on the item action)

if no match is found (nomatch_action):
  create_new (just add the incoming record)
  ignore (do nothing with the incoming bib; in this
          case, any items attached to it will be
          ignored since there will be nothing to
          attach them to)

The following options for handling items embedded in the
bib record are now available:

  always_add (add the items to the new or replaced bib)
  add_only_if_match (add the items only if the incoming bib
                     matches an existing bib)
  add_only_if_add (add the items only if the incoming bib
                   does *not* match an existing bib)
  ignore (ignore the items entirely)

With these changes, it is now possible to support the following use cases:

[1] A library joining an existing Koha database wishes to add their
    items to existing bib records if they match, but does not want
    to overlay the bib records themselves.
[2] A library wants to load a file of records, but only handle
    the new ones, not ones that are already in the database.
[3] A library wants to load a file of records, but only
    handle the ones that match existing records (e.g., if
    the records are coming back from an authority control vendor).

Documentation changes:

* See description above; also, screenshots of the 'stage MARC records
for import' and 'manage staged MARC records' should be updated.

Test cases:

* Added test cases to exercise staging and committing import batches.

UI changes:

* The pages for staging and managing import batches now have
  controls for setting the overlay action, action if no match,
  and item action separately.
* in the manage import batch tool, user is notified when they
  change overlay action, no-match action, and item action
* HTML for manage import batch tool now uses fieldsets

Database changes (DB rev 076):

* added import_batches.item_action
* added import_batches.nomatch_action
* added 'ignore' as a valid value for import_batches.overlay_action
* added 'ignored' as a valid value for import_records.status
* added 'status' as a valid value for import_items.status

API changes:

* new accessor routines for C4::ImportBatch

    GetImportBatchNoMatchAction
    SetImportBatchNoMatchAction
    GetImportBatchItemAction
    SetImportBatchItemAction

* new internal functions for C4::ImportBatch to
  determine how a given bib and item are to be
  processed, based on overlay_action, nomatch_action,
  and item_action:

    _get_commit_action
    _get_revert_action

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-30 21:58:46 -05:00
325b15b2ce Language corrections (fixes Bug 2023)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-22 17:39:58 -05:00
b2fa2b5341 Showing "OPAC (lang)" to further clarify location information. Adding calendar button to conform with other date entry form fields.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-22 17:39:42 -05:00
Galen Charlton
1c22e304a0 added preview MARC links to manage staged import
In the list of bibs for an import batch, the sequence
number is now a link to a preview of the original
MARC record - uses the same JavaScript widget as the
preview for Z39.50 search results.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-14 23:47:06 -05:00
f36beeec74 Bug #1855
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-11 16:56:32 -05:00
Galen Charlton
bb770a8d9d granular permissions - setting user permissions
Adjusted the user permissions editing page as follows:

* Replaced table with a list
* Implemented a tree control using the jQuery Treeview plugin
* When CheckSpecificUserPermissions is ON, if a module
  flag has specific (i.e., children) permissions, allow
  them to be edited - this is where the tree control
  comes in.
* Added some hooks and an initial stab at the CSS
  to style the permissions editor tree.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-10 15:53:22 -05:00
fa9a411a2f Adding max-width to patron image in sidebar, correcting some markup in picture uploads.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-08 08:37:12 -05:00
Ryan Higgins
8d51042a29 Add Logging module 'SYSTEMPREFERENCE', log adds, mods & deletes.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-07 15:59:51 -05:00
Chris Nighswonger
b626a8bb9a Adding file size limit to picture-upload.pl
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-01 06:44:17 -05:00
0a694b581c Beginning work on Calendar compatibility fixes
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-25 07:22:26 -05:00
Joshua Ferraro
bf70c57899 Updating translations for release
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-22 14:51:07 -05:00
64f93777a9 Fixing branch select onChange() function, hopefully fixes Bug 1957, Holiday Calendar broken in Internet Explorer
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-21 21:46:28 -05:00
Chris Nighswonger
2ed253639b Modifications to viewlog.pl to keep it in the context from which it was called.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-19 15:44:45 -05:00
f3dbe6c27b Adding tablesorter
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-18 15:18:51 -05:00
Ryan Higgins
760ce0b18c Partial commit to add Create-Label-Batch-from-Import-Batch
Import batch portion herein. Still need to touch Labels.pm .

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-17 21:32:30 -05:00
Chris Nighswonger
19cced4a87 Sixth installment Patron card generation feature
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-17 20:43:08 -05:00
Joshua Ferraro
61f0807abf fix for bug 1855: Language in News
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-17 19:27:25 -05:00
Chris Nighswonger
6a61c4b6a9 Implementing TMPL_ELSIF; NOTICE: REQUIRES Template::Pro 0.69
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-08 11:19:30 -06:00
Chris Nighswonger
55b353f79a Adding Update/Delete functions to patron image management on Details page
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-06 12:14:44 -06:00
e639717070 Adding 'Mark and Continue' buttons to inventory interface. Buttons are added via js because they require js to function.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-05 08:13:57 -06:00
1351ac2e28 Fixes for Bug 1721 (Modification Log link loses context)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-28 07:59:01 -06:00
bfbae81162 Some changes related to recent commits to patron images: Markup and javascript changes for upload form; Enabling passing of cardnumber and filetype variable to picture upload form; changes to picture display to handle missing image; Adding link to picture upload form from missing image display in circ and moremember; Removal of English text from 'no patron image' file.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-27 09:02:37 -06:00
a60e54b64b Tweaking workflow of inventory
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-27 09:02:27 -06:00
Chris Nighswonger
de1754d68d Third installment on moving patronimages into the database.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-23 10:55:44 -06:00
Chris Nighswonger
4b232a0c36 Second installment on moving patronimages into the database
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-23 10:55:41 -06:00
2538e369ce Fix for bug 1844, links in the log no longer server erroring
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-22 06:30:55 -06:00
Paul POULAIN
a35d66bc8c introducing a noprint class to hide things on printer
this noprint class can be used for all buttons & other places where the screen display something you don't want to see on printer.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-19 20:27:38 -06:00
Galen Charlton
c90af5d48b more holiday/calendar work
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-15 08:25:46 -06:00
Galen Charlton
1b5fc7a2da fixed radio buttons for holiday exception/deletion
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-15 08:24:58 -06:00
Galen Charlton
b01eb81b7a XHTML corrections: tools and reports
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-15 08:24:46 -06:00
Galen Charlton
31ca38a8c0 XHTML corrections for bib display and item add
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-15 08:24:44 -06:00
Paul POULAIN
309f4face9 bugfixing inventory
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-11 16:13:33 -06:00
Chris Nighswonger
f05e50cee2 Modified viewlog.pl to discern where it was called from and display the appropriate menu.
If viewlog.pl is called from the circulation menu, then the circulation menu is displayed.
If viewlog.pl is called otherwise, the tools menu is displayed.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-03 07:24:40 -06:00
Chris Nighswonger
1ea2a840b9 More work on picture-upload.tmpl
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-03 07:24:21 -06:00
Chris
80d4bd222f Bugfix for Bug 1618: First Installment
This corrects the major template issues once files are uploaded.
The changes need dressing up a bit still.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-03 07:23:41 -06:00
Joe Atzberger
429caef2a5 holidays.tmpl - format cleanup, CSS-ification, English corrections
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-23 21:31:16 -06:00
Joe Atzberger
49ba04d272 Calendar (js) tweaks: histsearch fixed, viewlog template updated
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-09 14:50:15 -06:00
Chris Cormack
40851ea4cc Removing replace sql from admin/letter.pl as per bug 1546
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-08 19:23:48 -06:00
Joshua Ferraro
6072ccc28e Improvements to handling language subtags
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-05 02:59:10 -06:00
Galen Charlton
a91b10dd57 inventory: two fixes
* Replaced direct "update items" with ModItem call
* fixed problem in template that prevent barcode file upload
  from working

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-03 16:24:28 -06:00
Joshua Ferraro
4e8f822f6e fix to bug 1569
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-25 11:46:31 -06:00
Joshua Ferraro
3d1fb4462f nomenclature improvements, updating README.txt
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-22 15:10:32 -06:00
9d23361f24 Even more applying standard dialog styles to confirmation messages. Also fixing alternating table row colors in stopwords.pl
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-20 07:34:00 -06:00
Joe Atzberger
31b3746ea9 viewlog.tmpl + calendar.inc: builds Date_from_syspref javascript function.
This is likely the durable fix to bridge the gap between syspref on the server
and client side validation scripts.  It may be useful to separate Date_from_syspref
from the calendar js, but at this time their applicability is 1-to-1.
Note also js debug variable and CGI param('debug') responsiveness.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-19 18:54:52 -06:00
86e458a3ce Standardizing format for error/message dialogs. <div class="dialog alert"> for high-priority warnings/confirmations. <div class="dialog message"> for lower priority/informational messages.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-14 10:57:46 -06:00
100a51e6c2 Cleaning up and styling picture upload page. Second try for this patch.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-14 10:57:36 -06:00
Joshua Ferraro
0dd6825a81 owen's fixes to picture upload
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-14 08:49:26 -06:00
Joe Atzberger
7aef1da6cf koha-news.tmpl - Cancel button still referenced "opac-news" instead of "koha-news"
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-08 07:28:35 -06:00