Commit graph

10044 commits

Author SHA1 Message Date
Galen Charlton
20b2bbba5e bug 3222: fix display of message queue
If no messages have been sent to the patron, display
a notice that that effect in the staff patron messaging
tab rather than just a blank page.

[LL bug 452]

Signed-off-by: Daniel Sweeney <daniel.sweeney@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 13:21:02 -05:00
Galen Charlton
d036fd463d bug 3222: fix Safari display of patron category preferences
[LL bug 454]

Signed-off-by: Daniel Sweeney <daniel.sweeney@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 13:20:59 -05:00
Galen Charlton
17475d7772 bug 3222: tweak sending of hold filled notification
Send a hold filled notification only when the item
is (assumed) to enter the hold shelf, i.e., when
the request status (reserves.found) is set to 'W'.

Signed-off-by: Daniel Sweeney <daniel.sweeney@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 13:20:57 -05:00
Galen Charlton
b6e62489d8 bug 3222: moved messaging preference editing
The display and editing of messaging preferences
for a patron have been moved as follows:

* the prefs for a patron are now displayed on the
  patron details tab, not the messaging tab.
* the prefs are now modified by editing the patron
  record, not on the messaging tab.

The messaging tab now contains only the list of
messages that have been or will be sent to the patron.

When creating a new patron record, changing the patron
category via the category dropdown now also changes
the default messaging preferences for that patron.  If
you start editing a new patron, change one of the messaging
preferences, then change the patron category, the form will
ask you if you want to keep the preferences or get
the defaults belonging to the new patron category.

Note that when you edit an existing patron record, changing
the patron category will *not* cause the messaging preferences
to be automatically changed.

Programmer's note: this commit introduces a new web service,
members/default_messagingprefs.pl, that uses Jesse Weaver's
C4::Service module.

Signed-off-by: Daniel Sweeney <daniel.sweeney@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 13:20:56 -05:00
Galen Charlton
8e5eea5c4e bug 3222: set messaging preferences during patron import
If the EnhancedMessagingPreferences option is ON, when
creating a new patron record via the patron import, set
the default messaging preferences to the applicable values
the default preferences for the patron category.

Messaging preferences are currently changed only when
*adding* a patron record via the import; if the import
updates an existing record, the patron's existing
preferences are not changed.

API changes:

SetMessagingPreferencesFromDefaults() is a new function
in C4::Members::Messaging to unconditionally replace
the current messaging preferences of a patron with the
default preferences from a specified patron category.

Signed-off-by: Daniel Sweeney <daniel.sweeney@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 13:20:53 -05:00
Galen Charlton
a1200e6498 bug 3222: messaging preferences for patron categories
Add the ability to set the default circulation messages preferences
for a patron category.  When the EnhancedMessagingPreferences
syspref is ON, the administrator will be able to define
default patron messaging preferences for a patron category.  When
a new patron record is created (either manually or via a patron
import), the new patron's preferences will be copied from the default
for that patron's category.

Signed-off-by: Daniel Sweeney <daniel.sweeney@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 13:20:52 -05:00
Galen Charlton
224a0a1bac bug 3222: new module to handle messaging preferences form
Define and use a new module, C4::Form::MessagingPreferences,
to handle displaying and processing the messaging preferences
form.  This change reduces code duplication between OPAC
and staff.

Signed-off-by: Daniel Sweeney <daniel.sweeney@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 13:20:50 -05:00
Galen Charlton
ca7db466d6 bug 3222: changes to messaging preferences form
Moved the messaging preferences form to a new
include, messaging-preference-form.inc, so that
it can be used to set messaging prefs both for a
patron and for a patron category.

Signed-off-by: Daniel Sweeney <daniel.sweeney@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 13:20:49 -05:00
Galen Charlton
2288b86fbb bug 3222: C4::Members::Messaging changes
Updated GetMessagingPreferences() and SetMessagingPreferences()
in this module to allow a categorycode to be passed
instead of a borrowernumber, permitting default preferences
for a patron category to be stored.

Signed-off-by: Daniel Sweeney <daniel.sweeney@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 13:20:48 -05:00
Galen Charlton
329678f39b bug 3222: database changes for messaging preferences (DB rev 033)
This patch modifies the database for the messaging
preferences enhancement <http://wiki.koha.org/doku.php?id=en:development:rfcs3.2:rfc32_defaultmessagingsettings>
as follows:

* adds a categorycode column to borrower_message_preferences

This allows a set of messaging preferences to be linked
to a patron category

* allow the borrowernumber column to be null

This allows a messaging preference set to be linked
*only* to a patron category.  If MySQL had check
constraints, I would add one so that exactly
one of borrowernumber and categorycode in a row in
borrower_message_preferences could be NULL.

* add a FK constraint from borrower_message_preferences.categorycode
to categories; if you delete a patron category, any default preferences
associated with it will be automatically deleted.

The messaging preference enhancement was sponsored by the Northeast
Kansas Library System (NEKLS).

Signed-off-by: Daniel Sweeney <daniel.sweeney@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 13:20:45 -05:00
Galen Charlton
1a23381418 bug 3243: fix adding patron after resorting in patron label search
Also needed to keep track of the batch type.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 09:32:40 -05:00
MJ Ray
c234ec4c2d bug 3243: pcard-members-search fails to add patrons to batch after using some links
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 08:57:04 -05:00
MJ Ray
55e079d023 Add patron card member searching by category code
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 08:56:26 -05:00
Joe Atzberger
70c6a9fdf3 Bug 3239 - Content-Script-Type and Content-Style-Type
This adds headers to define the default script and style languages.
Please note that this output isn't 100% canonical from CGI yet, but
that is due to a bug in CGI:
  http://bugs.koha.org/cgi-bin/bugzilla3/show_bug.cgi?id=3243

So either CGI will perfect it's output, or we can switch to using
HTTP::Headers.  The latter may be desirable anyway, since then we
would not need a CGI $query argument at all.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 08:05:48 -05:00
Galen Charlton
d832ae4bc3 followup to previous patch - don't use TMPL_IF EXPR
Because of the way that HTML::Template::Pro evaluates
expressions, any variable referred to in a TMPL_IF EXPR
must be be present when the template is parsed, otherwise
you get Apache error log warnings like this:

non-initialized variable new_subfield

For a simple flag check, TMPL_IF NAME="new_subfield" is sufficient.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 07:43:46 -05:00
Andrei V. Toutoukine
aa8422889a =?utf-8?q?Usability=20of=20marc=5Fsubfield=D1=8B=5Fstructure
modified:   koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 07:36:31 -05:00
Galen Charlton
391a6d3261 bug 2001, 2432: improve unAPI implementation
Improves Koha's unAPI support as follows:

* The implementation no longer depends on there being
  an accessible Zebra or SRW server.  Instead, responses
  are created by running the bib MARCXML through local
  stylesheets.
* unAPI now works for all bibs, not just ones that have
  an ISBN.  The ID format is changed from koha:isbn:ISBN
  to koha:biblionumber:BIBNUM.
* unAPI now correctly advertises the formats it supports.
* This implementation now passes validation testing at
  http://validator.unapi.info/ .
* MODS3 support now works correctly.  As a consequence, this
  patch fixes bug 2432 (Zotero support when using the XSLT
  OPAC stylesheets).

TODO: as additonal XSLT stylesheets are created to convert
UNIMARC bibs to additional formats, the stylesheet map
in opac/unapi should be updated.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 07:31:43 -05:00
Joe Atzberger
9620e07f15 Cleanup circ/billing.pl
Remove ton of unused variables.
Remove wrong use of BiblioDefaultView on INTRANET side.
Consolidate failover values.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 07:24:43 -05:00
Joe Atzberger
dd611563a9 Cleanup circ/stats.pl
Use elsif and else.  FIXME's added.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 06:50:25 -05:00
Joe Atzberger
6cc8cb75f8 Cleanup C4/Stats.pm
Use C4::Debug.  Remove $sth->finish and an unconditional warn.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-22 06:47:52 -05:00
Chris Cormack
b4935c4a5e Adding a new committer to the history docs
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 19:19:36 -05:00
Garry Collum
7fe2fb0956 Bug 3245: advancedMARCeditor syspref not returning to cataloguing tab
The advancedMARCeditor system preference was not returning to the cataloguing tab after you changed its value in system preferences.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 15:56:10 -05:00
koha
8bb3cff5ad Updated create_koc_db.pl to output SQlite2 files compatible with the Offline Circulation system, rather than the SQlite3 files that required post-processing.
[RM Note: patch by Kyle Hall <kyle.m.hall@gmail.com>]

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 15:27:56 -05:00
Michael Hafen
6c0dbfb86d offline_circ must use SQLite v2 - because Kyles PHP does
The Offline Circ tool by Kyle Hall uses PHP's SQLite, which is SQLite
v2.  Gnope, which Kyle links, ships with libSQLite v2.

Let's not count on libsqlite3 not being installed for perl.  If it is
installed DBD::SQLite will use it, where DBD::SQLite2 will not.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 15:26:21 -05:00
Michael Hafen
5d30ed4ce8 followup to patch by Galen - add javascript to prevent premature submission of forms in Fines pages
Adds javascript to the manual invoice and manual credit pages to prevent
the premature submission of these forms when using a barcode scanner.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 15:20:50 -05:00
Galen Charlton
0accd06fd7 bug 2897: fix English sample notices
Same as Joe's prior 2897 patch, but applied to the English
sample_notices.sql - due to a Git merge and rename detection
oddity, his original submitted patch was applied to the French
sample_notices.sql.  Since the two files are
currently identical, no problem in the end.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 15:09:52 -05:00
Joe Atzberger
f8f41b3a84 Bug 2897 - sample notices include bogus values
items.content is invalid for anything but overdue notices.  It is
not processed by advance_notices.pl for DUE and PREDUE.  Also, the
odd greeting "Dear firstname title" is standardized to match the
other messages' "Dear firstname surname".

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 15:09:41 -05:00
Galen Charlton
ca0b430068 bug 2726: updated doc to explain auth_by_bind option
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 14:27:27 -05:00
Michael Hafen
083ad362e1 in Auth_with_ldap.pm try binding with user password or compare
This changes the checkpw code in Auth_with_ldap.  Along with comparing
the user entered password against the directory attibute userPassword
you can try to bind with the users dn and password.

This is controlled by the option auth_by_bind, which, if set, causes
this code to try binding instead of comparing.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 14:19:49 -05:00
Nahuel ANGELINETTI
02d23609b1 Show "no title", when a notice doesn't have a title
This patch just check if there is a title, else show "No Title".

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 11:13:05 -05:00
MJ Ray
5c7ac4047c bug 2287: use defaults when needed even if CSV has correct number of columns
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 10:56:28 -05:00
Galen Charlton
74fd29d797 clean up redundant test
Credit to Joe Atzberger for cathing this.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 09:00:52 -05:00
Nahuel ANGELINETTI
6640cca486 (bug #3235) improve searchorder
If an supplierid is provided with a ordernumber, the search should be able to return everytime a record. This patch do the job.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 08:49:42 -05:00
Nahuel ANGELINETTI
a063e94c94 (bug #3149) fix searchorder
this patch fix the searchorder function, and add to the SQL query a "AND biblionumber" statement if a biblionumber is speficied.
Sometimes C4::Acquisitions::searchorder() find more than one result, so the user is looping to the same page to choose the great record, adding a contraint to biblionumber allows to be more strict.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 08:49:32 -05:00
Joe Atzberger
ce4c8c5b1e More cleanup on returns.pl
Removed unused variable.  Corrected comments.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 08:22:34 -05:00
Joe Atzberger
3c76a8334f Cleanup and enhance bookcount.pl and .tmpl
Eliminated bug with date handling outputting an English string.
Row striping added.  Highlight for "my branch" row added.
GetBranchesLoop used instead of recreating data structure, so we get the
benefit of branches being sorted (by display name).

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 08:18:01 -05:00
Galen Charlton
d8bd2345ed bug 3120: tweak DDCN call number splitting for labels
Allow a call number of the form MP3-CD F PARKER to be split as

MP3-CD
F
PARKER

instead of

MP
3
-CD
F
PARKER

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 08:01:41 -05:00
Joe Atzberger
4f9d77ed32 Add onlymine helper function.
This should allow scripts to use GetBranchesLoop without having to reproduce
the check for:
(1) IndependantBranches,
(2) User logged in,
(3) User Not superlibrarian, and
(4) User branch set.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 08:01:39 -05:00
Galen Charlton
3cf241d057 more permissions fixes on uk-UA installer SQL files
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 07:47:31 -05:00
Galen Charlton
1cfb7a6886 fixed permissions on ru-RU and uk-UA installer SQL files
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 06:52:59 -05:00
Andrei V. Toutoukine
e05915b64a Bug: Importing sample data removes marcflavour variable (ru-RU)
modified:   installer/data/mysql/ru-RU/mandatory/system_preferences_optimal.sql

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 06:49:16 -05:00
Andrei V. Toutoukine
809b89c816 import of the authorized values fails on the step 3 of the web-installation (ru-RU)
ERROR 1136 (21S01) at line 1: Column count doesn't match value count at row 1

	modified:   installer/data/mysql/ru-RU/authorised_values/authorised_values_[DAMAGED].csv.sql
	modified:   installer/data/mysql/ru-RU/authorised_values/authorised_values_[LOST].csv.sql
	modified:   installer/data/mysql/ru-RU/authorised_values/authorised_values_[NOT_LOAN].csv.sql
	modified:   installer/data/mysql/ru-RU/authorised_values/authorised_values_[RESTRICTED].csv.sql
	modified:   installer/data/mysql/ru-RU/authorised_values/authorised_values_[STACK].csv.sql
	modified:   installer/data/mysql/ru-RU/authorised_values/authorised_values_[WITHDRAWN].csv.sql

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 06:49:15 -05:00
Andrei V. Toutoukine
c4fb8e1928 Bug 3107. Creation of permissions table fails during the web-installation (ru-RU)
ERROR 1452 (23000) at line 3: Cannot add or update a child row: a foreign key constraint fails (`koha/permissions`,
CONSTRAINT `permissions_ibfk_1` FOREIGN KEY (`module_bit`) REFERENCES `userflags` (`bit`) ON DELETE CASCADE ON
UPDATE CASCADE)

	renamed:    installer/data/mysql/ru-RU/mandatory/permissions.sql -> installer/data/mysql/ru-RU/mandatory/userpermissions.sql
	renamed:    installer/data/mysql/ru-RU/mandatory/permissions.txt -> installer/data/mysql/ru-RU/mandatory/userpermissions.txt

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 06:49:05 -05:00
d0c692e896 Russian and Ukranian SQL files
(cherry picked from commit af505046af)

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 06:46:18 -05:00
Joe Atzberger
89391ca831 Cleanup returns, consolidate some repeated logic.
Use one $userenv_branch instead of many calls to C4::Context->userenv->{'branch'}
for comparisons.  Script is not warnings safe yet, but getting closer.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-20 08:41:18 -05:00
Nicole Engard
6bb030a0f7 BUG 2736 - added link for MARC country codes.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-20 08:38:09 -05:00
Galen Charlton
3f49ad62c8 bug 3236: remove disused scripts and a function
Removed opac/opac-dictionary.pl and catalogue/dictionary.pl,
which were not in use and not linked to from any active
template files.  According to Henri, the functionality that
these scripts implemented hasn't been working since 2.2.

Also removed C4::Search::findseealso(), which was used
only by the two scripts.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-20 08:37:58 -05:00
Nicole Engard
eb2513887d BUG #2736 Fix. Updated link to go to list of language codes.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-18 16:47:05 -05:00
Garry Collum
5a0f7dfc89 Bug 1768: Calendar now retains the month on which the user was entering data.
If a user adds or edits a holiday, the calendar will now return to the month in which the user was working.  Also after an add or an edit, if the user selects another location, the calendar remains in the same month for which the add or edit took place.  The user sees a 'calendardate' parameter in the URL in the format that is chosen as the system preference.  If an invalid date is entered in the url, the current date is used.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-18 16:37:58 -05:00
Nicole Engard
794b39a84e Bug 2736 fix. Updated link to go to LOC instead of itsmarc.com
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-18 16:22:38 -05:00