Commit Graph

10041 Commits

Author SHA1 Message Date
Joe Atzberger 27acd508dd Cleanup circ/overdue.pl
This also fixes a deficiency with overdue.tmpl not retaining the
user's selection of sort order when displaying results.
Removed 9 unused variables.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:58 +02:00
Galen Charlton b57b5ee07b 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>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:58 +02:00
MJ Ray 95a4819cb1 bug 3243: pcard-members-search fails to add patrons to batch after using some links
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:58 +02:00
MJ Ray cb064cb965 Add patron card member searching by category code
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:58 +02:00
Galen Charlton 493cb8c651 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>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:58 +02:00
Andrei V. Toutoukine 868d21d905 =?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>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:57 +02:00
Joe Atzberger 3f06bd90b4 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>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:57 +02:00
Joe Atzberger 7b6795aa3f Cleanup circ/stats.pl
Use elsif and else.  FIXME's added.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:57 +02:00
Joe Atzberger 5c626f4ad0 Cleanup C4/Stats.pm
Use C4::Debug.  Remove $sth->finish and an unconditional warn.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:57 +02:00
Michael Hafen 6efa22841b 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>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:57 +02:00
Galen Charlton 2a15f051e9 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>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:57 +02:00
Galen Charlton 040e9518e1 bug 2726: updated doc to explain auth_by_bind option
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:56 +02:00
Michael Hafen 60bf2ab7d8 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>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:56 +02:00
MJ Ray 858da3ea95 bug 2287: use defaults when needed even if CSV has correct number of columns
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:56 +02:00
Galen Charlton 24749efefd clean up redundant test
Credit to Joe Atzberger for cathing this.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:56 +02:00
Nahuel ANGELINETTI 6505196292 (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>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:56 +02:00
Nahuel ANGELINETTI e50a32fb0b (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>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:56 +02:00
Joe Atzberger 0607af5c62 More cleanup on returns.pl
Removed unused variable.  Corrected comments.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:55 +02:00
Joe Atzberger 8558a05a8b 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>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:53 +02:00
Joe Atzberger 09c7fb98bf 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>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:53 +02:00
Galen Charlton 710045365b more permissions fixes on uk-UA installer SQL files
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:52 +02:00
Galen Charlton c8274468d0 fixed permissions on ru-RU and uk-UA installer SQL files
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:52 +02:00
Andrei V. Toutoukine 58f659b6e6 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>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:52 +02:00
Andrei V. Toutoukine 16265f4607 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>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:51 +02:00
Andrei V. Toutoukine 32919c4322 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>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:51 +02:00
Joe Atzberger 8f18cca98d 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>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:51 +02:00
Nicole Engard 8952cb9fd9 BUG 2736 - added link for MARC country codes.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:51 +02:00
Galen Charlton 44a4e8943a 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>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:51 +02:00
Nicole Engard ada3cf0e22 BUG #2736 Fix. Updated link to go to list of language codes.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:51 +02:00
Garry Collum d6241ea71e 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>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:51 +02:00
Nicole Engard 1ff9c7ff00 Bug 2736 fix. Updated link to go to LOC instead of itsmarc.com
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:51 +02:00
Nicole Engard fb68188460 Bug 3102 Fix Part 2: Fixed terminology on Transfers to Receive.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:51 +02:00
Galen Charlton 4e38d604ef fix permissions on new icons
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:50 +02:00
Owen Leonard 3f53f8fb78 Adding 4 additional icons to the bridge set: Software, Audio, Journal, and Realia.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:50 +02:00
Galen Charlton 2ecb0f431f fix XHTML errors in z3950_search.tmpl
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:50 +02:00
Brian Harrington ba5ac9af28 Revisions to auto-generated authorities patch
It turns out that the "blank" record created by MARC::Record->new()
has a leader, so now I explicitly create one in addbiblio.pl.  I
also realized I can't count. :-)

Modified per comments by Joe and Galen to keep SetMarcUnicodeFlag
and move it and the leader set to earlier in the process.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:50 +02:00
Frédéric Demians e79991da1f Improve XSLT.pm performances
This patch is done in the process of understanding what's
going wrong with bug #3226. It improves some processing.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:50 +02:00
Garry Collum bc9c7ef1e1 Bug 1440: Show a list of holidays. Fix for the date formats.
This patch fixes the date formats in the holiday display tables.  They are now based on the syspref for date formats.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:50 +02:00
Darrell Ulm 237c83fb3c BUG #1277 Enhance: Z39.50 More search criteria
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:50 +02:00
Darrell Ulm 76cb1f06e8 BUG 1277 Enhance: Z39.50 More search criteria
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:50 +02:00
Galen Charlton 0c5340093a bug 3223: add 500 and 590 to MARC21 bib Note index (Zebra)
Note: to completely apply this change, ensure that the working
copy of record.abs is updated and rebuild the bib indexes
using rebuild_zebra.pl -b -x -r

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:49 +02:00
Chris Cormack a4d21f0626 Bug 1542, fixing filter by area in reports dictionary
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:49 +02:00
Garry Collum eff1b279e5 Bug 1440: Show a list of holidays. Second patch.
Fixed XHTML error that was introduced in the first patch. Added zebra striping to the tables. Removed an erroneous line with a date experiment that had no affect on the dates.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-09-16 23:18:49 +02:00
Chris Cormack 7032597703 Bug 2505 adding use warnings and fixing warnings in opac-basket.pl
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:49 +02:00
Nahuel Angelinetti 96598e5437 Add a date field in news edition, and permit to set the "timestamp" field, that is the publication date and modify the GetNewsToDisplay to return only news that timestamp is < to current date that permit to publish news later without any action.
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:49 +02:00
Owen Leonard 940558a3ee More fixes for Bug 2704, 440 Display Issues
Multiple series now display along with other detailed bibliographic information. Series title is displayed along with volume information. The template no longer displays information from biblioitems like volume and volumedesc in favor of information pulled directly from the MARC record.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:49 +02:00
Galen Charlton 358374a043 bug 3205: fix another error in the OAI-PMH Identify response
The optional description element of an Identify response
can't just be a string.  Identify.description is a container
for one or more elements; see http://www.openarchives.org/OAI/2.0/guidelines.htm

For now, simply commenting it out.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:49 +02:00
Frédéric Demians 91cf095e75 Bugfix 3205 - Fix OAI server resonse to Identify request
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:49 +02:00
Joe Atzberger 3d658f44f7 Bug 3130 and general cleanup
Javascript error in FF and IE when loading page and no data matches criteria.
This was because it was passing more holds than necessary to the template and
letting a template conditional inside the loop control whether to display or not.
That doesn't make sense, and it forces the table to be displayed even when all
rows FAIL the conditional.  jquery.tablesorter was confused trying to be added
on top of an empty table with nothing to sort.

There were several other errors addressed by this patch:
 ~ 13 unused variables deleted.
 ~ regexps run on user-supplied $var before checking $var defined
 ~ decimal ratio prohibited and silently replaced with "3"

I also added the hold ratio to a column display, with a jquery tweak to put it in
the ratio input box on click.  Hidden .sql div now contains the actual query run,
like the other wizard reports.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:48 +02:00
Mason James afa9cbae37 BUG:3072 small work-around patch to restore authorities searching
this is a work-around fix, until a future patch arrives to define the missing 'Heading-Main' zebra-index.

for 3.0.x

[RM note: also included in HEAD so that I can include the UNIMARC(A)
 updates by HDL]

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:48 +02:00