Commit graph

144 commits

Author SHA1 Message Date
7ceeccc1ed Spelling correction (catalogue -> catalog)
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-10-16 09:50:58 -05:00
Michael Hafen
5e963f0fc3 More Consistant terminoligy in stage-marc-import.tmpl
Changes 'Notes about this file' to 'Comments about this file'.  It's
'Comments' in the manage-marc-import.tmpl file.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-10-05 21:33:52 -05:00
96c29c707f Corrections to manage marc import interface, including fix for inaccurate progress bar.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-10-05 21:18:17 -05:00
cf56684c68 Markup and formatting improvements to Manage Staged Records interface.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-10-01 12:08:20 -05:00
13fca44836 Adding progress bar and some other visual enhancements to file upload interactions.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-10-01 11:58:21 -05:00
182f9df495 More fixes for Bug 2600, enabling the appearance of HTML tags in item titles. Resubmission.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-09-26 09:06:13 -05:00
1d54a98aa8 Altering system log search form to conform with other similar forms; escaping output of "info" variable.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-09-16 22:25:38 -05:00
7b2e4ebce2 A few more en-US spelling corrections; Markup corrections; Standardizing on "email" instead of "e-mail"; Copying isbn-formatting from opac-detail.pl to detail.pl;
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-09-09 10:53:02 -05:00
730ef80520 Spelling corrections: organisation->organization, authorise->authorize, catalogue->catalog
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-09-02 15:43:29 -05:00
Galen Charlton
a670f1817e bug 2509: fix file permissions
Following suggestion by Vincent Danjean for Debian
packaging, 0755 -> 0644 for non-executable
files.

Also removed shebang from a few modules in C4.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-21 18:55:02 -05:00
Ryan Higgins
e3fa9f2d5f Prevent borrower import from overwriting data that it shouldn't, and polish off a couple error conditions.
When an imported patron matches an existing one, keep data in the original record unless our import file
includes that column.  Also, check for branch & categorycodes, and produce error if invalid.  Finally,
auto-calculate expiry date if not given.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-08-09 19:07:07 -05:00
Joshua Ferraro
13789969b0 2482: Default Letter on Notice Triggers Causes Error
Changing 'Default' to 'No notice' as per solution
suggested in bug report
2008-08-09 08:08:11 -05:00
Joe Atzberger
49e4e7020d Patron import reform - bug 2287 - expanded error catching and feedback
This incorporates and extends the patch from MJ Ray attached to bug 2287.
Added feedback of up to 25 lines, including for errors at the Text::CSV
parsing level.  This allows feedback for problems than involve encoding.
Added link to download "starter" CSV file (with all the columns).

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-08-06 09:37:03 -05:00
Chris Nighswonger
1baf6348cc kohabug 2404 This patch removes Image::Magick and adds GD
This patch removes Image::Magick as a dependency and replaces it with
the (much) lighter GD. Functionality of patronimage code has not changed with
this conversion.

Adding errorhandling for corrupted image file and link to return to moremember.pl when called from there

Added notes about supported image mime types.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-07-30 03:38:18 -05:00
82d0920ec0 Spelling corrections (Fixes Bug 2381).
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-07-27 05:57:25 -05:00
Chris Nighswonger
af288205f5 kohabug 2154 Modifying form input controls to accomodate translations
Due to the logic of the underlying picture-upload.pl depending upon the "value" of the
form input controls and this value being translated, the script then failed to function.
This patch changes the input controls so that this should not be an issue.

This issue should be kept in mind, though, so that it can be avoided in the future.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-07-25 08:56:10 -05:00
DeAndre Carroll
e3e84a747f Bug#: 1989
Changed date popups in scheduler.tmpl to a date picker element
Made corresponding changes to scheduler.pl

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-07-04 09:22:29 -05:00
Galen Charlton
b8e404700a bug 2293: better validation in overdue rules editor
If a rule should not be saved because a delay is
given but no letter or debar action is specified
for that delay, an error message is now reported.

Also:

* use "dialog alert" CSS class for confirmation
  that form was saved
* if form input is saved, retrieve the settings from the
  database again when displaying the form - this will
  help turn up any bugs where the script is not
  saving the overdue rules correctly.
* fix display of patron category in error messages

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-07-02 12:25:50 -05:00
Galen Charlton
bf12bc05e1 overdue rules - added JavaScript for branch selector
This makes the overdue notice rule editor consistent
with the branch selector for the circulation rules
editor.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-07-02 12:25:41 -05:00
Galen Charlton
b4e457c84d bug 2292: save overdule rules to correct branch
Save overdue rules to the selected branch, not always
to the default branch.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-07-02 12:25:40 -05:00
37e4866b5b Correction to allow pop-up window to scroll. fixes Bug 2209, "Editing records in the inventory."
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 15:51:49 -05:00
ac7c215be3 Markup corrections. You can't embed a <!-- TMPL_IF --> inside an HTML tag because it causes problems for the translation script.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 14:05:53 -05:00
Galen Charlton
d351753d4e kohabug 1993 - task scheduler improvements
[1] Removed hardcoded path to original developer's
    Koha configuration file; now checks KOHA_CONF.
[2] Now attempts to figure out if a task was successfully
    added to the task queue; if it wasn't, the failure
    is now reported in the  task scheduler page.
[3] When traveling to the task scheduler page from a
    saved report, the report in question is now
    selected by default.
[4] Removed the button to edit a queued task; this is
    not supported.

This patch is essentially a bandage; I've added a BUGS
section and some FIXMEs to the POD for C4::Scheduler
detailing some issues - a refactoring of the task
scheduler is in order at some point.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-09 06:38:03 -05:00
Ryan Higgins
5dd5b0be33 Remove vestigial checkbox for label-batch creation on MARC import
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-05 22:47:35 -05:00
Ryan Higgins
34b4e77507 Independent-branchify MARC export. Add option to remove all holdings except your own, and force that behavior for independent branches. Also add accession date limit to export.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-02 00:50:35 -05:00
Ryan Higgins
fc98d228c2 Sort dropdowns for libraries by name instead of branchcode in several staff-side interfaces.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-02 00:50:33 -05:00
Joe Atzberger
4073b27c50 Wrap up Tags integration - add sysprefs for new installs.
Note that when the user is not logged in, the Tags input box/button will not display.
The user will see a message telling them to log in to add tags.  However, in order to
keep the results display clean, the message will display only once, utilizing the loop
context variable "__first__".  Useful stuff!

I also threw OPACShelfBrowser sysprefs.sql, but it still needs added to updatedatabase.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-31 21:59:12 -05:00
Galen Charlton
57fb7e45b7 kohabug 2186 - improve display of empty import batches
[1] Display the "No records have been staged" message only
    if no import batches exist.
[2] When displaying a batch that has no bibs in it, display
    a "There are no records in this batch to import".  Also,
    do not display the "import record into catalogue" button
    for an empty batch.
[3] Add CSS class "problem" to both messages.

Documentation changes: minor; only required if screenshots
exist of the manage staged MARC records page that has no
import batches on it.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-31 21:59:03 -05:00
Paul POULAIN
6600ea28bb change in button description to explain that we will import into catalogue
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-30 11:49:35 -05:00
Joshua Ferraro
5f6af04ee1 nomenclature cleanup: s/Branch/Library/ s/Document Type/Item Type/ 2008-05-30 11:36:04 -05:00
756cdc15ac Swapping tablesorter version. GZipped version may have been responsible for errors in Internet Explorer. Change to usermenu.inc is whitespace only, for proper display in IE.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-13 17:40:28 -05:00
157b5a1eb6 Adding checks for dateformat preference so that tablesorter script can be passed an extra parameter for proper sorting of metric dates (Bug 2089, dates & table ordering with jquery)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-12 10:06:32 -05:00
Galen Charlton
5cafd551be patron attributes - batch import
When ExtendedPatronAttributes is ON, the batch
patron import tool's behavior changes as follows:

[1] A new (required) column is added to the input CSV
    format.  This column should contain a list of
    attributes to set for the record, each value
    preceded by its type code.  For example, if
    the superlibrarian has defined two types,
    a unique identifier INSTID and a repeatable
    BASEBALL, this field could contain:

    "INSTID:12345,BASEBALL:Cubs"

    This field must be wrapped in quotes if multiple
    values are defined.  Since values can contain
    spaces, additional doubled-quotes may be required:

    "INSTID:12345,BASEBALL:Cubs,""BASEBALL:White Sox"""

    When replacing a patron record, any attributes specified
    in the input file replace all of the attribute values
    of any type that were previously assigned to the patron
    record.

[2] It is possible to specify a field other than the
    cardnumber to use for looking for matching patrons.
    Specifically, any attribute marked as a unique ID
    can be used.  The operator is asked to specify
    which ID type to use; if an input record has an
    attribute value of that type, and exactly one patron
    record in the database has that value, then the
    record will be overlaid or ignored according to the
    overlay setting.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-12 09:03:10 -05:00
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