Commit graph

15490 commits

Author SHA1 Message Date
Paul Poulain
c52f0b7fdf Bug 6875 de-nesting C4/Serials
* use C4::Branch is loaded only to call GetBranchNAme in PrepareSerialsData
  and set branchname in the hashresult. This sub PrepareSerialsData is used
  in the following scripts :
opac/opac-serial-issues.pl:    my $subscriptioninformation=PrepareSerialsData($subscriptions); => no use of branchname after
serials/serials-collection.pl:   $subscriptions=PrepareSerialsData(\@subscriptioninformation); => no use of branchname after
=> we can remove the ->{branchname} from the result, and remove the C4::Branch dependancy
* moves use C4::Items to require C4::Items, to call AddItemFromMarc, when
  receiving a serial, with Recieving create an item set in the subscription.
* removed use C4::Letters and C4::Search, that are useless

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-02-15 14:58:38 +01:00
Paul Poulain
6fbe49ce31 Bug 6875 cleaning opac-main.pl
C4::VirtualShelves, C4::Branch and C4::Acquisition are useless, removing their
loading

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-02-15 14:58:36 +01:00
Paul Poulain
056b5faa40 Bug 6875 cleaning mainpage.pl
AutoritiesMarc is loaded for nothing : we don't display authorities anywhere,
so removing the dependancy as well as the useless code

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-02-15 14:58:31 +01:00
Paul Poulain
8165aeef77 Bug 6875 de-nesting C4::Koha.pm
* removed use C4::Output, that was not used
* moved use URI::split to getitemtypeimagelocation and switched to "require".
  Checked it still works through admin/itemtype.pl
* moved use Business::ISBN to _isbn_cleanup.pl and switched to "require".
  Checked it still works with the following small script :

use C4::Koha;
print GetNormalizedISBN("1-56592-257-3");

(GetNormalizedISBN uses _isbn_cleanup)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-02-15 14:58:28 +01:00
Paul Poulain
1ffbd262b3 Merge remote-tracking branch 'origin/new/bug_5327' 2012-02-15 13:55:48 +01:00
Paul Poulain
4fa0e4c88c Revert "Added coverage to unit test for TTParser"
This reverts commit 77c4307176.
2012-02-15 13:55:32 +01:00
Paul Poulain
5a6cdd088f Revert "Bug 5327: Patch removes unneeded self=shift from TTParser::unshift_token"
This reverts commit d0bb27bf23.
see : http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5327#c171
2012-02-15 13:54:44 +01:00
Paul Poulain
6f6bfb8aff Merge remote-tracking branch 'origin/new/bug_5327' 2012-02-15 10:49:53 +01:00
Duncan Tyler
77c4307176 Added coverage to unit test for TTParser
http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-02-15 10:47:25 +01:00
Chris Hall
d0bb27bf23 Bug 5327: Patch removes unneeded self=shift from TTParser::unshift_token
Removed  unneeded self=shift from unshift_token
(as peek and next do not take a self, makes interface more consistent)

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-02-15 10:47:23 +01:00
Chris Cormack
efd26a44d5 Bug 7432 : Fixing caching for C4::Languages
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-15 10:26:26 +01:00
Chris Cormack
516abc4896 Bug 7432 : Fixing caching for SQLHelper
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-02-15 10:26:24 +01:00
Chris Cormack
70237c49ef Bug 7432 : Fix how we are setting expiry time when caching
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-02-15 10:26:22 +01:00
0027fe0cc3 Bug 6598 [REVISED] OPACFineNoRenewals syspreference does not stop user renewing in opac
This patch standardizes the condition under which renewal controls
are displayed at the page (as opposed to item) level. In some
places "canrenew" was used, in others "patron_flagged" was used.
Now "canrenew" controls renew controls and "patron_flagged" only
triggers the display of user warnings.

This patch also allows for renewal information to be displayed
for each item in situations where OPAC renewals are allowed but
disabled for whatever reason. This gives the patron information
about used/available renew counts but hides renew controls.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-14 22:15:23 +01:00
Paul Poulain
edee01dd0f Bug 6299 follow-up DBrev 2012-02-14 21:37:17 +01:00
a9d260ee1f Bug 6299 - Advertise this addition during upgrade
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
August 10, 2011: Fixed some small typos.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Oct 7th, 2011: rebased for master

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-02-14 21:27:52 +01:00
1142b189f2 Bug 6299 - add es-ES
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Confirmed that the RELTERMS authorised values category is populated. Not
knowing Spanish I can't comment on the translations, but any errors can be
corrected at a later date.
2012-02-14 21:27:48 +01:00
147a3f8b97 Bug 6299 Add relator codes for fr-FR
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Confirmed that the RELTERMS authorised values category is populated. Not
knowing French I can't comment on the translations, but any errors can be
corrected at a later date.
2012-02-14 21:27:45 +01:00
211a10c83a Bug 6299 - Provide a list of authorized values for Relator terms
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
August 10,2011: Tested install and upgrade.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
January 28, 2012: Removed untranslated non-en SQL relator term files.
2012-02-13 18:12:47 +01:00
Julian Maurice
2916ddae4a Bug 6838: Add pagination and filtering on subscriptions table
Use dataTables plugin

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-13 16:49:35 +01:00
4a6ec50c62 Fix for Bug 5280 - Fix password field so that the password is masked as it is entered
This patch changes the password field to a password type input on
member-password.pl and adds a confirmation field to both member-password.pl
and memberentry.pl requiring that the password be re-entered to
confirm.

Client-side and server-side validation for the two password fields has been added
to both pages. Multiple error messages can now be displayed together on
member-password.pl.

If the user wishes for Koha to suggest a random password on member-password.pl
they can click a link which will remove the password-type input fields, replace
them with text-type fields, and automatically fill them with the random
password suggestion.

Follow-up fix lets the members.js correctly handling errors when there are
no mandatory fields

LR followup: fixing slight error that corrects previously reported template error.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Tested password setting/changing utilities - all work as expected and described.
Passes prove t xt t/db_dependent tests congruent with current master failures (adds no new fails).

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-13 16:39:59 +01:00
Maxime Pelletier
89893e8d43 Bug 6634 manager_id and itemnumber not populated when paying fines
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-13 15:16:21 +01:00
Paul Poulain
324615e396 Merge remote-tracking branch 'origin/new/bug_5327' 2012-02-13 15:06:16 +01:00
Chris Cormack
181f3b36ee Bug 5327 : Removing a broken test
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-02-13 15:04:43 +01:00
e306dd85bd 7392 last follow up
Fixes typo for marcstd option in template
2012-02-13 13:29:00 +01:00
Paul Poulain
08156df33c Bug 7345 DBrev numbering 2012-02-13 12:21:59 +01:00
Paul Poulain
9bd52ff781 bug 7345 tiny change = replacing () by --
In the syspref description there is a () that could be confusing with possible values that are also displayed with ()
replacing them by -- to avoid any mistake
2012-02-13 12:21:33 +01:00
923c778e00 7392 Followup on pref description
Updating text only for description of opaccolorstylesheet and opaclayoutstylesheet.
2012-02-13 11:32:54 +01:00
Katrin Fischer
a5658c4647 Bug 7392: Follow-up
Patch makes changes according to QA comments:
- entering an unknown format code will generate no entry in the OPAC pull down
- small change to the description of opaclayoutstylesheet system preference

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-02-13 11:32:53 +01:00
Katrin Fischer
44cffb63e0 Bug 7392: Add system preference to define export options in OPAC
NOTE: Patch depends on changes made for bug 7345 for the "marcstd" option.

It adds a new system preference 'OpacExportOptions':

The new system preference allows to give a list of | separated
values to define, which download options are offered in OPAC.
Possible options are listed in the system preference editor
and include the new export option 'marcstd' from bug 7345.

The sequence of the download options in the system preference will
be the sequence in the OPAC pull down.

If left empty, the export option will be hidden from OPAC.

This patch creates a new include file for the OPAC with all the
code that is common to the three detail views (regular, MARC, and
ISBD).

As a side effect of creating this include file, some inconsistencies
in OpacSearchForTitleIn were fixed. {BIBLIONUMBER} and {CONTROLNUMBER}
were broken for ISBD and MARC view before and should now be replaced
with the correct values in all tabs.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Resolved merge conflicts on sysprefs.sql and updatedatabase.pl.

Feb 13, 2012: Rebased it again.
2012-02-13 11:32:50 +01:00
Jared Camins-Esakov
6378436089 Bug 7345: Enable exporting records sans private fields
Add an option for marcstd to the opac-export.pl and catalogue/export.pl
scripts. This new format removes all 9XX, X9X, XX9 fields and subfield $9
(with the exception of 490 in flavours of MARC other than UNIMARC). The work is
done in C4::Record::marc2marc.

This patch adds the new export option 'marcstd' for exporting MARC
records without 9xx, x9x and xx9 fields and subfields to the staff
detail page.

Testing plan:
1. Export a record in "MARC (Unicode/UTF-8)" format as a control
2. In the OPAC, run the following jQuery to add the marcstd option to the UI:
> $("#export #format").append("<option value='marcstd'>MARC (no 9xx)</option>");
3. Export the same record in "MARC (no 9xx)" format
4. Compare the two, noticing that any subfield $9 or fields including 9 (other
   than 490 in flavours of MARC other than UNIMARC) have been removed

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Works as advertised now.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
This patch squashes both the original patch and Katrin's follow-up adding
marcstd as an export option on the staff client.

Feb 13, 2012 (marcel): Amended this patch to resolved two definitions of $error in catalogue/export script.
2012-02-13 11:32:18 +01:00
Paul Poulain
1161079e1f Bug 7511 [ENH] Template caching (T::T feature)
Just add to your Koha configuration file
<template_cache_dir>/path/writable/by/apache/user</template_cache_dir>
in the <config> block, and Koha will use template caching, for about
10% CPU time saving.

on linux servers, /tmp is usually OK

(also fixes an indenting with a TAB)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
The results of using this are very striking. Based on an insufficient
sample size, it would seem that the time spent in T::T is reduced by a
factor of at least 5.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-13 11:01:46 +01:00
Robin Sheat
858efb4886 Bug 7519 - show patron's street number in search results
When searching for a patron in the staff client, their address is shown.
However, the street number component isn't included. This includes it.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

It works as announced. I confirm that street number isn't displayed on patron
search result table without this patch, and is displayed with this patch.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-13 10:21:21 +01:00
Jared Camins-Esakov
44fd379dc2 Bug 7501: OPAC auth browser should have alternating colors
Test plan:

1. Access authority browser in OPAC. Note that all rows have the same background
   color.
2. Apply patch, notice that colors now alternate.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-13 10:18:19 +01:00
Paul Poulain
bca1de8c9a Bug 7090 follow-up, setting DBrev number when pushing 2012-02-10 19:43:54 +01:00
Srdjan Jankovic
2041f2c973 bug_7090: AllowItemsOnHandCheckout syspref
Observe AllowItemsOnHandCheckout syspref when using SIP self checkout

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
To test:
* place an item on hold for patron A
* attempt to circulate that item to patron B (via SIP/selfcheck)
	syspref off: item should not circulate to patron B
	Syspref On: item should circulate to patron B

Both conditions passed in our testing.
Also verified that normal staff client behavior regarding this situation was preserved. It was.
2012-02-10 19:28:25 +01:00
Paul Poulain
bd28b8d6c3 Merge remote-tracking branch 'origin/new/bug_6865' 2012-02-10 16:09:19 +01:00
ac3b4061b7 Bug 6865 - Follow-up, Replace image-based gradient backgrounds with CSS3 gradients
Staff client login screen has a separate CSS file which wasn't
included in the original changes for Bug 6865. This caused a 404
error (missing background image).

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tested in Chrome, FF, Safari, and IE8.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-10 16:08:09 +01:00
8ec2e22a7a Bug 7147 - Style Z39.50 search errors according to style patterns
Styles Z39.50 errors and messages in the standard style.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-10 16:06:01 +01:00
78f2ac2862 Bug 7505 Superlibrarian can't export all biblios when IndependantBranches is enabled
When a Koha user has superlibrarian permissions, and if
IndependantBranches is enabled, in Tools > Export bibliographic and
holdings, this user can't export all biblio records. He will just export
the biblio from the branch he belongs to.

This patch fix that.

To test:

  - Do a ALL records export as superlibrian on a multi-branches Koha instance
  - Examine the resulting MARC file with the tool of your choice (MArcEdit,
    yaz-marcdump, etc.)
  - You will see that 952/995 contains exlusively items from your branch (as
    Koha user)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-10 15:56:15 +01:00
Adrien Saurat
19d6339c26 Bug 7457: log cleaning on basket.pl
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-10 15:35:12 +01:00
Paul Poulain
098ac93315 Merge remote-tracking branch 'origin/new/bug_6842' 2012-02-10 15:19:20 +01:00
Duncan Tyler
3317d16029 Small fix to allow help popup in IE9, not 7 or 8 - bug 7339
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-10 15:12:36 +01:00
Paul Poulain
28646dd550 Merge remote-tracking branch 'origin/new/bug_929' 2012-02-07 16:43:29 +01:00
Chris Cormack
6a06860f0c Bug 929 : Follow up, shifting test 2012-02-07 16:42:22 +01:00
Janusz Kaczmarek
c1e47b9359 Error in records.abs for marc21/biblios
http://bugs.koha-community.org/show_bug.cgi?id=7502
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-06 21:51:48 +01:00
e1ebabf3ec Bug 7127 - Follow-up - Templates must be valid XHTML
Corrections to OPAC search results and lists pages for validity
errors: duplicate ids, invalidly placed elements, unescaped
ampersands.

The change to localcovers.js adds a check for <span> in addition
to <div> so that the results template can use a <span>

The <form> tag has been removed from the inline tag entry
markup in order to correct a display error in Internet Explorer 8.
Removing it doesn't affect functionality or validity.

To test: Validate the HTML of the OPAC results page and an OPAC
list contents page (/cgi-bin/koha/opac-shelves.pl?viewshelf=XX).
Verify the functinality of adding tags on both pages with the
TagsInputOnList system preference enabled. Verify that local
cover images are display on search results and detail pages.

Includes fixes for errors spotted by QA

Revisions

Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-06 21:38:32 +01:00
311dbc8bc1 Bug 7127 - Templates must be valid XHTML
Replaces & with &amp; on several template pages

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
2012-02-06 21:38:29 +01:00
Chris Hall
deeefdeaec Bug 6943: Added ability to duplicate a budget tree (from the edit sub menu)
http://bugs.koha-community.org/show_bug.cgi?id=6943
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- all new javascript alerts have translations markers _()
- hierarchies and permissions were copied correctly

Possible enhancements:
- make it possible to move orders from old to new funds
- make it possible to change description while copying, saving 1 additional
step

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-03 17:53:59 +01:00
Kyle M Hall
58c62f69c1 Bug 6490 - Lost and paid not updated when book is checked out.
Signed-off-by: Liz Rea <wizzyrea@gmail.com>

Tested:

item checked out and marked lost - item is removed from borrower's checkouts and charged to patron
Checking out the item (without checking it in first) removed the fines and issued the item normally.

Passed prove t xt t/db_dependent (results congruent with current master failures)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-03 17:37:52 +01:00