Commit Graph

10065 Commits

Author SHA1 Message Date
Nahuel ANGELINETTI ae47264e2f (bug #3170) check if mandatory fields are not empty
This patch make authority and biblio add/edit to check that at least one subfield of mandatory fields are filled-in.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:01 +02:00
Galen Charlton d502715f53 bug 3272: preserve formatting when editing help
Tweak the TinyMCE settings so that more of the original
whitespace and HTML is preserved when editing help, making
help patches easier to understand.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:01 +02:00
Zeno Tajoli 33908944b8 Fix(2) bug 3266 The 'link' feature in MARC_framework is only for MARCDisplay This second patch for the same bug is only for white spaces and newlines
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:00 +02:00
Garry Collum 31e1463b3d Bug 3252: Fixes XHTML on catalog statistic form page.
Several form input fields were within a <table> element, but not in a <td>.  This patch pulls the input fields out of the table.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:00 +02:00
Galen Charlton 48a2830165 bug 2884: followup patch
[1] Restore behavior of the input field for the library
    code; when adding a new library, it should be a
    a text box; when editing an existing library,
    should be a hidden input.
[2] When user attempts to add a new library with the same
    code as that of an existing library, populate the form
    with what the user entered for the new library, not the
    values from the existing library.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:00 +02:00
Paul Poulain 334bebd130 fix for #2884: Add error management to branches
While trying to add a new Branch with an existing Branch code, the UI says "Library saved" instead of something such as "Please select a unique branch code".

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:00 +02:00
Paul Poulain 2fffbc98b1 removing comments
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:00 +02:00
Paul Poulain 3465124e24 Fixing API of ModBiblioMarc
no need to retrieve $biblionumber, as we already know it

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:00 +02:00
Paul Poulain 474dca7cb7 (not new_acq related) smallfix to avoid a die in case of an invalid record
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:00 +02:00
Paul Poulain 25c0e2da2f removing useless line (use Data::Dumper)
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:00 +02:00
Zeno Tajoli f536c5a990 Fix bug 3266 The 'link' feature in MARC_framework is only for MARCDisplay
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:00 +02:00
Garry Collum 2433397385 Bug 2266: Could not uncollapse a tag if you turn on advancedMARCeditor - Revised.
Added javascript and if/else logic to the addbiblio.tmpl and a corresponding anchor tag in CSS.
If advancedMARCeditor is on, the user now clicks on the tag number to expand the marc fields.
If advancedMARCeditor is off, no functionality has changed.  The user clicks on the marc tag's title to expand the marc fields.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:59 +02:00
Joe Atzberger 8798195141 Allow option to preserve Extended Attributes on patron import update.
Essentially, this patch provides the option to overwrite only matching
Extended Attributes, instead of all of them, treating the ext. fields more
like normal fields.

Several functions added to Members::Attributes with corresponding tests.

[ LL ref. 342 ]

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:59 +02:00
Rick Welykochy 67ca2183fc bug 2641, 3263: Staff Search Results Interface Changes
New detail view: labeled MARC

New bib record view in the staff interface that
displays the MARC record in a single page.

Featured sponsored by MassCat.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:59 +02:00
Galen Charlton f7b82dd5f1 bug 1933: started work fixing IntranetBiblioDefaultView syspref
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:59 +02:00
Ricardo Dias Marques b4174807f4 Updated INSTALL.opensuse file to wiki version
Updated INSTALL.opensuse file to match the one currently (as of 26-May-2009) available in the wiki at:

Installation Guide for Installing Koha 3 on openSUSE 11 - Koha Developer Wiki
http://wiki.koha.org/doku.php?id=opensuse_11.0

This commit is supposed to be applied to the 3.0.x branch.

Changelog:

– Updated last modification date to 02-Dec-2008
– Tried to clarify that one should add the word "rewrite" (without the quotes) to /etc/sysconfig/apache2 in case a2enmod does NOT work
– "make test" does NOT return "Can't connect to data source" errors any longer. Updating "make install" section accordingly
– Updated "make test" output for Koha installation (it doesn't give connect errors any longer)
– Added prompt to accept permanent instlallation of "Test-Manifest-1.22.tar.gz" during "XML::RSS" install
– Installing "XML::RSS" now also installs "Time::y2038"
– Added "force install" of "Barcode::128"
– Added output of "MARC::Charset" installation (that points that it is already up to date)
– Updated "CGI::Session::Serialize::yaml" section that now installs Test::Pod
– Added "MIME::LITE" installation that is new in Koha 3.0 Final
– Removed ImageMagick installation because it's no longer required in Koha 3.0 Final
– Added instructions to install the "GD" Perl module and its package dependencies
– Added "Email::Date" installation that is new in Koha 3.0 Final
– Updated list of prerequisites according to changes done in Koha 3.0 Final
– Added missing step to install yaz. Thanks to Bob Ewart for catching it
– Added explanation of answering Yes to "Install the Zebra configuration files" in a NOZEBRA installation, like this one
– Added explanation of "fr" (French) choice for Koha install
– Promoted run "make install" to Heading 4

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:59 +02:00
Chris Cormack 2d207b47c6 Quick fix to catch some instances of XSS vulnerability, there will be more probably, thanks for the heads up Mark
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:59 +02:00
Garry Collum f552336002 Bug 1687: Can't assign holidays to all branches at once.
This patch adds a select box to the new holiday form that allows the user to copy the holiday to all branches. If a holiday for a particular location already exists for a location, that holiday and location is not changed.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:59 +02:00
Garry Collum 915a339832 Bug 3022: Cataloging statistic wizard not pulling the itemtype data correctly.
Added code to detect if the syspref for item-level_itypes is being used.  The report now correctly returns data based on the syspref.  There are some pre-existing XML errors with the FORM view of catalogue_stats.pl.  I'll send a subsequent patch to deal with these.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:59 +02:00
Joe Atzberger 1fab8a8a5f Cleanup transferstoreceive.pl and .tmpl
Removed unused variables.  Replaced EXPR.
Inserted hidden span to correct tablesorter behavior on title field.  Without this patch
because of the link href in the cell, the sort would end up being effectively on
biblionumber, not title.

Mostly whitespace edits in template.

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
Nicole Engard 8a2525069a Fixed capitalization and standardized statements.
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
Garry Collum fe4a9d5974 Bug 3253: Fixes XHTML for the Patron Statistics form page.
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
Garry Collum faa189bfee Bug 3254: Fixes the Catalog by Item Type report XHTML.
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
Owen Leonard 574863187b Fix for Bug 3233, tabs on detail page change when clicking on MARC view
This change adds a check for the XSLTDetailsDisplay preference since different MARC view tabs display on the detail page if that pref is on or off.

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
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