Commit graph

18459 commits

Author SHA1 Message Date
4a5bc7ecb7 Bug 9660 - OpenLibrary covers are too small on OPAC search results
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

Works as advertised. OpenLibrary book cover API offers 3 cover sizes: small,
medium, and large. Switch from small to medium, for result page, with
downsizing.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Improves display of OpenLibrary covers in OPAC result list.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-29 21:47:51 -04:00
Jared Camins-Esakov
a19d663438 Merge branch 'bug_9797' into 3.12-master 2013-03-29 21:44:08 -04:00
Fridolyn SOMERS
f69ebeef67 Bug 9797 - Follow up : use double quotes in javascript translatable strings
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-29 21:44:05 -04:00
c0bc0eaa2b Bug 9797 - Untranslatable strings have returned to ajax.js
The patch for Bug 8942 undid the changes to ajax.js made by Bug 9331.
This patch puts those changes back.

To test that preference-related error messages continue to work,
open the system preferences editor in two tabs. Log out in one tab and
try to save a system preference in the other. You should see correct
error messages.

Signed-off-by: Pierre Angot <tredok.pierre@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-29 21:44:05 -04:00
Jared Camins-Esakov
bd64e71ce9 Merge branch 'bug_9926' into 3.12-master 2013-03-29 21:39:29 -04:00
6d70af92f0 Bug 9926 - Missing perl modules in Koha
To test:

1) check perl syntax on file
     $ perl -cw ./misc/migration_tools/koha-svc.pl

     you should *not* get 'syntax OK' returned from command

2) apply patch, and install File::Slurp module
      $ sudo cpanm File::Slurp

3) check perl syntax on file
      $ perl -cw ./misc/migration_tools/koha-svc.pl

      you should now get 'syntax OK' returned from command

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: Without File:Slurp 1) complains of missing module,
with module then sintax Ok.
No errors.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Changed module from required to optional. The two files in which
it is used are extraneous from the viewpoint of the average user.
2013-03-29 21:38:49 -04:00
Jared Camins-Esakov
548845ecee Merge branch 'bug_9908' into 3.12-master 2013-03-29 21:29:21 -04:00
Thatcher Rea
06b9bb2097 Bug 9908 - Fixing OCLC Connexion Client
Fix issue where exporting a bib from the OCLC Connexion client
or web interface to a Koha database would always result in
an "Unsuccessful request" error.

To Test:

[1] Apply patch
[2] Start the Connexion import daemon.
[3] Start the Connexion client or web interface (requires that you
    you posses OCLC cataloging credentials).
[4] Locate a bib and use Connexion to export it to the Koha database.
[5] Verify that the bib is successfully added.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Logical change and trusting sign off here as I don't have
access to WorldCat for testing this.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-29 21:29:10 -04:00
Jared Camins-Esakov
9e9cf86997 Merge branch 'bug_9923' into 3.12-master 2013-03-29 21:28:10 -04:00
Christophe Croullebois
392ae1245f Bug 9923: (MT #11060) actual cost not getting populated
The patch 7129 introduces a bug if the unitprice is 0.0000.
Instead of showing in this case the 'ecost' if there is not 'unitprice',
it shows 0.00 and the 'Actual cost' must be manually entered. The line:
if ( @$results[0]->{'unitprice'} == 0 ) {
    @$results[0]->{'unitprice'} = '';

was wrote in this perspective.
But sprintf ( "%.2f", with '' or 0 or any string will return 0.00
and then, in the .tt 'unitprice' exists so we have the bad result.

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-29 21:26:28 -04:00
Jared Camins-Esakov
d8f2e43ef5 Merge branch 'bug_9930' into 3.12-master 2013-03-29 21:09:49 -04:00
Jared Camins-Esakov
eb60b90322 Merge branch 'bug_9783' into 3.12-master 2013-03-27 22:58:19 -04:00
c061790f97 Bug 9783 - can hit submit twice when adding patrons
Currently, clicking twice or more on the Save button will generate
duplicate patrons when adding patrons in the Patron module. Of course,
there is handling that detects this, so you can choose to either edit
the original record (i.e. throw away the duplicate) or create a
duplicate record.

However, it shouldn't get to that point by clicking on the Save button.
That handling seems to be there to handle cases where you go through the
whole process of trying to add a new patron only to find out that they
already exist in the system (or at least their username/password do).

--

This patch uses the "preventDoubleFormSubmit" function (which is also
used in holds and fines to prevent double form submits). It was also
necessary to edit members.js, since "check_form_borrowers" was forcing
form submits despite the "preventDoubleFormSubmit" function. I've
changed it from forcing a document.form.submit to return true, which the
browser will still submit the form if it's a unique borrower, but the
"preventDoubleFormSubmit" function will still prevent multiple submits.

I've also added a "waiting" class to staff-global.js which changes the
cursor to "wait" (i.e. loading circle graphic). I've included an
"AddClass" call in "preventDoubleFormSubmit", so that the cursor graphic
will change to show users that the page is loading so that they don't
click Save again. Of course, even if they do click save again, there
will only be one submit. However, this way - as Chris Cormack mentioned
- the user knows that "something" is happening and that the form isn't
broken.

-------
Test Plan

Before applying patch...

1) Fill out the form for a new patron in the Patron module
2) Click "Save" several times
3) Once the page loads, you'll be shown a prompt that says that this
   borrower already exists. You will have the option to view the
   original record, edit the original record, or create a new patron
   anyway
4) Click on edit the existing record, and delete the patron

Apply the patch

5) Repeat steps 1 and 2
6) Notice that your cursor has changed into a little "loading" circle
   graphic when you hover over the "body" of the page, as well as any
   links or any inputs/buttons of the type "submit" within that form
7) Notice that no matter how many times you press the button, the form
   is not re-submitted. Eventually you will be taken to the new patron's
   record (no mention of duplication will occur)

Ta da! Multiple form submits are prevented and the loading graphic
signals to users that the form was submitted and that Koha is processing
their data

--

I understand that some people might want to change which elements are
given the "waiting" class. I'm happy to renegotiate this as necessary.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Looks good and works nicely.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-27 22:58:17 -04:00
Jared Camins-Esakov
710491ead3 Merge branch 'bug_9881' into 3.12-master 2013-03-27 22:45:16 -04:00
1e9c0578ce Bug 9881 - Remove unused tablesorter plugin from offline circulation page
The offline circulation list template doesn't need to include the
tablesorter plugin, it's unused. This patch removes it.

To test, submit some circulation transactions through the Firefox
offline circulation addon. Load the offline circ page
(offline_circ/list.pl). Confirm that there are no JavaScript errors, and
that "check/uncheck all" links work correctly.

Signoff comment: Test plan works as expected. Firebug and Chrome's builtin developer tool don't raise any errors.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
One line change, followed test plan, no negative
consequences found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-27 22:45:14 -04:00
Jared Camins-Esakov
9b3ca71451 Merge branch 'bug_9863' into 3.12-master 2013-03-27 22:40:32 -04:00
Peter Crellan Kelly
cf75c7c92c Bug 9863: Correct casing and add arrow-heads for consistency with earlier submit messages.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Small change to make interface a little bit more consistent.
Reran web installer to test correct behaviour.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-27 22:40:26 -04:00
Jared Camins-Esakov
dd82a7bcd6 Add two new developers to the history
Welcome, Peter and Kristina, you are numbers 203 and 204.
2013-03-27 22:14:22 -04:00
Jared Camins-Esakov
8bae32a35e Merge branch 'bug_9595' into 3.12-master 2013-03-27 22:05:14 -04:00
Kristina D.C. Hoeppner
50c435dced Bug 9595: Change GPL license to 3.0
Change the general Koha license from 2
to 3 in the About page and also link to
the new YUI BSD license page

Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All links seem to be correct now.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-27 22:04:30 -04:00
Jared Camins-Esakov
1f17e09f3a Merge branch 'bug_9918' into 3.12-master 2013-03-27 22:01:56 -04:00
Robin Sheat
16ea5ffd1d Bug 9918 - build script updates, default to building 3.12
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-27 21:49:27 -04:00
Robin Sheat
85e164d702 Bug 9918 - Changelog updates for 3.12
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-27 21:49:09 -04:00
cd47a746eb Bug 9930 - can't update patron info in ccsr
Test Plan:
1) Enable ccsr theme
2) Log into update, update personal details
3) Go to mainpage.pl in intranet
4) Note there is no alert for patron modifications
5) Apply patch
6) Repeat step 2-3
6) Note there is now an alert for patron modifications

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Passes tests, tested per test plan, no side effects noted.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Requires PatronSelfRegistration and PatronSelfRegistrationDefaultCategory
to make the form show up.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-27 21:36:39 -04:00
Jared Camins-Esakov
5fe6d9f7e3 Merge branch 'bug_9919' into 3.12-master 2013-03-25 08:43:29 -04:00
Peter Crellan Kelly
07228e5080 Bug 9919: Correct syntax error caused by missing comma.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Simple fix for a bad problem.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-25 08:43:26 -04:00
Jared Camins-Esakov
a4f4d69c3b Merge branch 'bug_9914' into 3.12-master 2013-03-23 10:48:48 -04:00
Jared Camins-Esakov
c54e959cad Bug 9914: dependency updates for 3.12
Update the lists of packages required for various versions of Debian and
Ubuntu.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-23 10:46:07 -04:00
Jared Camins-Esakov
3293434c23 Bump version for Koha 3.12.00-beta1 release 2013-03-23 09:54:28 -04:00
Jared Camins-Esakov
8b1e66cd44 Correct 3.11 updates to use CheckVersion rather than TransformToNum 2013-03-23 09:52:58 -04:00
Jared Camins-Esakov
c44ed57ea2 Update release notes for 3.12.00-beta1 2013-03-23 09:35:08 -04:00
Jared Camins-Esakov
67573c9cdf Merge branch 'bug_9912' into 3.12-master 2013-03-23 09:13:32 -04:00
Jared Camins-Esakov
e6897638e9 Bug 9912: DateUtils.t must not access database
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-23 09:13:16 -04:00
Jared Camins-Esakov
a7dca2736f Add Rolando Isidoro to history
Congratulations, Rolando! You are the 202nd developer with a patch in Koha.
2013-03-23 08:29:20 -04:00
Jared Camins-Esakov
81c9f80bde Merge branch 'bug_9911' into 3.12-master 2013-03-23 08:27:15 -04:00
Jared Camins-Esakov
0177dd4b62 Bug 9911: update Acquisitions unit test to look for correct fields
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-23 08:26:31 -04:00
Jared Camins-Esakov
b9db6ae0f7 Revert "Merge branch 'bug_7688' into 3.12-master"
This reverts commit 60508cb03d, reversing
changes made to 8579d07f14.

The patches for bug 7688 caused a failure in t/db_dependent/Serials.t:
not ok 8 - test getting history from sub-scription

Conflicts:

	installer/data/mysql/kohastructure.sql
	installer/data/mysql/updatedatabase.pl
	kohaversion.pl
2013-03-23 00:36:37 -04:00
Jared Camins-Esakov
8a97ab05a8 Merge branch 'bug_9506' into 3.12-master 2013-03-23 00:29:15 -04:00
Jonathan Druart
d7072455cb Bug 9506: FIX gst list values for each basket
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Problems raised by QA for the basket list page in the 3 pages
layout (pdfformat::layout3pages) fixed.

GST column on the summary page now gives a list of all used
GST rates for each individual basket.

All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-23 00:28:57 -04:00
Jonathan Druart
8a5cef4242 Bug 9506: FIX GST values for the basketgroup print action
Due to the multi VAT development (Bug 5335), values are not well calculated in
the pdf generated by the basketgroup print action.

Test plan:
- Add one or more basket to a basketgroup.
- Close and print this basketgroup
- Check that different values correspond to values in the basket detail page.

Don't forget to test with different parameters (multiple vat, vendor
include/don't include tax).

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-23 00:28:57 -04:00
Jared Camins-Esakov
6c4da573db Merge branch 'bug_6209' into 3.12-master 2013-03-23 00:13:15 -04:00
Paul Poulain
f634c4cfb1 Bug 6209 follow-up, make strings translatable
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-23 00:12:59 -04:00
c28f7d7de5 Bug 6209 [Revised] Standardize on one plugin for client-side form validation
This patch adds the jQuery "Validation" plugin
(http://docs.jquery.com/Plugins/Validation) and includes it by
default in the staff client along with an include file containing
translatable strings for all of the plugin's possible messages.

The staff client's main JavaScript file has been modified to perform
automatic validation of any form with the class "validated."

For a simple example I have modified the library entry form
to mark required fields as required (something which had not
been done before). Each required field has been given a class,
"required" and the HTML5 attribute "required." The former adds
the hook for the plugin, the latter adds browser-based validation
in recent browsers (and which will be superceded by the plugin
if JavaScript is enabled).

This will check for inputs classed "required" without any
additional configuration. More complex forms (with specific
data types, for instance) will require more inline JavaScript
configuration.

$("#FormID").validate({ /* configuration details */ });

Also added to the library entry form are checks on the email and URL
fields via classes ("email" and "url", respectively). This demonstrates
validation of content without forcing the field to be required.

To test, go to Administration -> Libraries and Groups and choose
"New library." Submit the form without entering a library code
or name. You should be prevented from submitting the form and be
shown an error message by each field. Perform the same check with an
existing entry.

To test browser-based validation, disable JavaScript and follow
the same procedure.

Revision rebases the patch against current master and adds missing
"//<![CDATA["

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: Work as described with new or existing library.
No errors.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-23 00:12:36 -04:00
Jared Camins-Esakov
3cd9293b6a Merge branch 'bug_5343' into 3.12-master 2013-03-22 23:57:05 -04:00
Jared Camins-Esakov
44d285b1c5 Bug 5343: Increment version number
Database update for bug 5343 has been given version 3.11.00.116
2013-03-22 23:56:51 -04:00
Jonathan Druart
de93edb6a5 Bug 5343: Fix non english string
Replace "Not orderable" with "Cannot be ordered"
and 3 others typos

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.

Testing notes:
- Ordered same subscription multiple times
- Tried different settings of AcqCreateItem for a full
  workflow from order to receive
- Undid a receipt and checked correct behaviour
- Ordered a book in between, to see item creation and
  receiving still works.

Note for documentation:
Acquisition details on the subscription only show the
last invoice and the last order. You can of course find
all orders/invoices using the acquisition search.

Overall very nice much needed functionality!
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-22 23:54:47 -04:00
Jonathan Druart
7f9c747a3c Bug 5343: Fix non english string
Replace "Not orderable" with "Cannot be ordered"

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-22 23:54:46 -04:00
Jonathan Druart
3aef361065 Bug 5343: Followup: remove useless string on the serials result page
Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-22 23:54:46 -04:00
Jonathan Druart
8e978c7ce0 Bug 5343: It is not possible to add a subscription for another supplier
If a supplier is defined for a subscription, you cannot order this
subscription to another supplier. If no supplier is defined, you can.

FIX: If a cancelled order is linked to a subscription, you can order it.

Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-22 23:54:46 -04:00
Jonathan Druart
5eceb4706b Bug 5343: Followup: invoicenumber no longer exists, use invoiceid.
A previous patch replaces invoicenumber with invoiceid.

Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-22 23:54:46 -04:00