Commit graph

17672 commits

Author SHA1 Message Date
Colin Campbell
7e7b3731dc Bug 8433 Remove unused 'use English'
Adding a use English to mosules which dont may
waste a few CPU cycles and bytes of storage
but doesnt add anything to the sum of human happiness

Remove unnecessary use English's
Removed already commented out but equally unnrcessary
use Exporter in same modules

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-13 08:42:50 -05:00
Jared Camins-Esakov
73d84bc362 Merge branch 'bug_9292' into 3.12-master 2013-01-13 08:39:00 -05:00
a1e9e3d8d9 Bug 9292 - Remove dead code related to 'publictype'
This patch removes the superflous code related to 'publictype' which
is a key set for item hashes in some perl files. This key is never
used or stored.

Test Plan:
1) Apply patch
2) Test catalogue/detail.pl, opac/opac-detail.pl and opac/opac-user.pl
3) You should not see any changes in behavior

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-13 08:38:47 -05:00
Jared Camins-Esakov
863a7c429d Merge branch 'bug_9065' into 3.12-master 2013-01-13 08:32:21 -05:00
Fridolyn SOMERS
e81cc3d1d3 Bug 9065 - set correct permission for upload local cover image
This patch fixes a problem where if a staff user has the
upload_local_cover_images permission (and is not a superlibrarian
and does not have all of the tools permissions), trying to use the
"Tools -> Upload local cover image" will fail with "You do not have
permissions [...]".

To test after applying the patch:

- Create a staff uesr that has just the catalogue and
  upload_local_cover_images permission.
- Log in as that staff user.
- Go to "Tools -> Upload local cover image".
- Verify that one is given the form to upload a cover image.
- Without the patch, one will be presented with the login
  form instead.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

mysql> select * from permissions where code="upload_cover_images";
Empty set (0.00 sec)

mysql> select * from permissions where code="upload_local_cover_images";
+------------+---------------------------+---------------------------+
| module_bit | code                      | description               |
+------------+---------------------------+---------------------------+
|         13 | upload_local_cover_images | Upload local cover images |
+------------+---------------------------+---------------------------+
1 row in set (0.00 sec)

"git grep upload_cover_images" returns 0 result.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-13 08:32:18 -05:00
Jared Camins-Esakov
e901ae15de Merge branch 'bug_8977' into 3.12-master 2013-01-09 08:18:34 -05:00
Jared Camins-Esakov
fc1385a282 Merge branch 'bug_9076' into 3.12-master 2013-01-07 22:02:20 -05:00
280037da0c Bug 9076 - QA Followup - Rename GetBorrowersWhoHaveNotBorrowedSince to GetBorrowersToExpunge
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-07 22:01:36 -05:00
Jonathan Druart
76dc0c73ae Bug 9076: Followup: FIX ergonomic issues
If no criteria is given, the form was submitted.
Labels were wrong

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-07 22:01:36 -05:00
d9b0c46d2e Bug 9076 - Followup - Perltidy cleanborrowers.pl
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-07 22:01:36 -05:00
568a4c1230 Bug 9076 - Add ability to delete borrowers by expiration date and category code to cleanborrowers.pl
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Tested per plan, works. Staff category is not shown, and patch passes automated testing.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-07 22:01:35 -05:00
Jared Camins-Esakov
11341ec0a0 Merge branch 'bug_9335' into 3.12-master 2013-01-07 21:13:11 -05:00
f887edc3ab Bug 9335 - humanMsg popups don't disapear in webkit browsers
The popup message that appears after saving changes to system
preferences should dissapear upon any user actions (i.e mouse
click, mouse move, typing) but this does not happen in modern
webkit based browsers since jQuery was updated.

This patch adds the suggested fix to the jQuery plugin code as
suggested on https://code.google.com/p/humanmsg/issues/detail?id=9

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Tested with Google Chrome on Windows 7

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Tested with Google Chrome 22 and Firefox on Debian
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tested with the following browsers:
  Mac: Chrome 23, Firefox 16.0.2, Opera 11.61, Safari 5.1.7
  Windows: IE8, Firefox 3.6.26
2013-01-07 21:12:10 -05:00
Jared Camins-Esakov
8768162c8e Merge branch 'bug_9141' into 3.12-master 2013-01-07 20:49:12 -05:00
f2c2be1c20 Bug 9141 - Untranslatable strings on "pay an amount..." page
Moving text of an error message from the script into the
template. To test, submit an amount which is greater
than the amount due. You should see an error message
displayed correctly with a properly-formatted currency
amount.

Signed-off-by: Marc Veron <veron@veron.ch>

Patch behaves as expected.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-07 20:48:42 -05:00
Jared Camins-Esakov
3c9d931120 Merge branch 'bug_9346' into 3.12-master 2013-01-07 20:47:41 -05:00
Dobrica Pavlinusic
5ee5693410 Bug 9346 - acqui/neworderempty.pl ignores exchange rates and destroys user data on page load
This restores behaviour of new order form before Bug 5335 merge

Test scenario:

1. load Receipt summary for existing customer
2. take note of Unit cost and Order cost
3. open existing order line and verify that Replacement cost,
   Budgeted cost and Total are not re-calculated on page load
4. change currency and verify that costs are updated
   (change currency to system default and all values should become
   same as vendor price)
5. change Quantity, get alert "You can't add a new item, please create a new order line"
   and verify that Total still reflects correct value

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-07 20:47:38 -05:00
Jared Camins-Esakov
1005ad9b5f Merge branch 'bug_9331' into 3.12-master 2013-01-07 20:35:47 -05:00
fd07c72f38 Bug 9331 - Untranslatable strings in ajax.js
This patch moves untranslatable strings from ajax.js into the template
where they can be picked up by the translation script.

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.

To test that error strings are now translatable, run "perl translate update
 <lang>" from misc/translator, then check if the affected strings shows
up in the po file.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Still works, and is now translatable

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-07 20:34:39 -05:00
Jared Camins-Esakov
588a55a581 Merge branch 'bug_8984' into 3.12-master 2013-01-04 08:40:00 -05:00
Mathieu Saby
e86e3c24b8 Bug 8984: make Zebra more UNIMARC compliant
This patch makes the following changes to record.abs, biblio-koha-indexdefs.xml and biblio-zebra-indexdefs.xsl :
- adding new (sub)fields to Identifier-standard index : 011f/g ; 012a ; 013a/z ; 014a/z ; 015a/z ; 016a/z ; 017a/z, 040a/z, 071z, 072z, 073z
- adding 1 new subfield to Publisher index : 071b (may contain the name of a music publisher)
- adding new (sub)fields to Author and  Identifier-standard index (for the $9) : 716, 72X, 730 - adding new (sub)fields to Note : 334$a (award note)
- correcting 207 and 208
- suppressing 308a and 328a in Note (useless as complete fields are indexed in same index)
- adding (sub)fields to Title index : 411t, 421-425t, 433-437t, 442-444t, 446-456t, 462-463t, 470-488t, 560
- adding (sub)fields to Subject and  Identifier-standard index (for the $9) : 608, 615, 616, 617, 620, 621
- adding some classifications index : 670, 675, 686 - adding some comments (to make easier further modifications and to identify non unimarc fields : 414-420, 603, 630-636, 646)

To test :
- take a record and fill some of the missing fields (e.g 488t, 608, 720, 012a) with some data as "field488", "field608" etc
- try to find the record => not possible
- apply the patch, copy the new record.abs in etc/zebradb/biblios/etc and rebuild zebra
- try to find the record => should be ok
- check nothing else is broken...
- same test with DOM indexing activated

http://bugs.koha-community.org/show_bug.cgi?id=8984
Signed-off-by: Zeno Tajoli <tajoli@cilea.it>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-04 08:39:56 -05:00
Jared Camins-Esakov
70487e8740 Merge branch 'bug_8924' into 3.12-master 2013-01-04 08:25:49 -05:00
Jared Camins-Esakov
ff7fdd79bb Bug 8924: Some modules erroneously skipped by 00-load
Several patterns were being skipped unnecessarily in t/00-load.t:
* C4::Cache* - no longer exists
* C4::Record - no longer requires database
* C4::Serials - no longer requires database

To test:
1) Unset KOHA_CONF and/or shut down MySQL.
2) Run `prove t/00-load.t`
3) If the test passes, the patch is good.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

144 tests passing.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-04 08:25:06 -05:00
Jared Camins-Esakov
9970c7e93c Merge branch 'bug_9102' into 3.12-master 2013-01-04 08:14:03 -05:00
Chris Cormack
a51a78b71c Bug 9102 : Set HttpOnly on the CGISESSID cookie
https://www.owasp.org/index.php/HttpOnly

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

To test, use curl

Before the patch

% curl -I http://192.168.2.135
HTTP/1.1 200 OK
Date: Sun, 18 Nov 2012 06:56:49 GMT
Server: Apache/2.2.22 (Ubuntu)
Pragma: no-cache
Cache-control: no-cache
Content-script-type: text/javascript
Content-style-type: text/css
Set-Cookie: CGISESSID=19689f6e7d8ec94c25269fecebf2f009; path=/
Vary: Accept-Encoding
Content-Type: text/html; charset=UTF-8

After patch

 % curl -I http://192.168.2.135
HTTP/1.1 200 OK
Date: Sun, 18 Nov 2012 07:01:04 GMT
Server: Apache/2.2.22 (Ubuntu)
Pragma: no-cache
Cache-control: no-cache
Content-script-type: text/javascript
Content-style-type: text/css
Set-Cookie: CGISESSID=da25baf03c0bc1e2c512a627028e43e6; path=/; HttpOnly
Vary: Accept-Encoding
Content-Type: text/html; charset=UTF-8
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-04 08:14:01 -05:00
Jared Camins-Esakov
c27a981856 Merge branch 'bug_7919' into 3.12-master 2013-01-02 16:51:37 -05:00
Jonathan Druart
7dacc32501 Bug 7919: FIX the "all" categories method
The C4::Category->all method must return fields from the categories
table only.
Without this patch, there is 2 "categorycode" values, the second one is
sometimes undef (if no branch limitation).

same for the GetBorrowercategoryList routine (some category codes are
undefined)

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Signed off for also fixing problems with patron searching noted by Katrin.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Problems fixed by this patch include:
- on patron search result list the category description is shown again
- it's possible to limit a patron search to a patron category again

All tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-02 16:50:52 -05:00
Jared Camins-Esakov
aa7ac570b2 Merge branch 'bug_9052' into 3.12-master
Conflicts:
	koha-tmpl/opac-tmpl/prog/en/css/sco.css
2012-12-30 18:36:34 -05:00
Robin Sheat
e24bcabb05 Bug 9052 - followup: fix the YUI CSS locations for SCO
This is followup to the previous YUI-fixing patch, and simply causes the
self-checkout page to load the YUI files via the sco CSS file,
and that gets re-written at package build time to work.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested on a package installation using packages built by
Mirko Tietgen and a git dev installation.

To test:
1) Enable WebBasedSelfCheck system preference
2) Enter login date for staff user in AutoSelfCheckAllowed... prefernces
3) Go to the self checkout page:
   .../cgi-bin/koha/sco/sco-main.pl
4) Verify all pages have the usual look, CSS, Javascript and images
   look normal
5) Verify the same is true for translated templates

Manual: http://manual.koha-community.org/3.10/en/selfcheckout.html
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-30 18:35:06 -05:00
Jared Camins-Esakov
c784ee479f Merge branch 'bug_8877' into 3.12-master 2012-12-28 20:22:18 -05:00
Mirko Tietgen
1932d4f809 Bug 8877 [ENH] MARC21 field 511 missing from XSLT
Adds MARC21 field 511 to the OPAC XSLT file.

Signed-off-by: Marc Veron <veron@veron.ch>

COntents of field 511 appears as expected.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch changes OPAC XSLT display,
511 is shown as defined by the MARC21 standard.
If 1st indicator is 1, the label cast is shown in front of the 511 field.
If 1st indicator is 0 or empty, no label is shown.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-28 20:22:07 -05:00
Jared Camins-Esakov
02018fa3a6 Merge branch 'bug_9209' into 3.12-master 2012-12-28 20:16:12 -05:00
Jared Camins-Esakov
47a8c10d99 Bug 9209: Skip tests for older DBD::Mock
Because the calendar tests require a more recent version of DBD::Mock
than has been packaged by Debian, it makes sense to skip all the tests
requiring the database when only an older version is present.

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Works as advertised
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-28 20:15:36 -05:00
99410d7ce4 Bug 9209 - Mocked Koha::Calendar tests
Using specific method for populating the internal data structures from Koha::Calendar
has yielded to the non-detection of several bugs. There are also several tests that where
db_dependent which is not always desirable.

I propose the use of DBD::Mock (::Session) for using the actual code used by Koha in production
for testing, mocking the DB queries itselves.

I also took the time to repeat several tests in different syspref configurations (they applied
only to daysMode=Calendar, and now cover all confs).

Notes:
- I used DBD:Mock 1.45 as previous version (1.43, from 12.04) was broken
- Some tests revealed a bug on days_between as I see it... reporting as Bug #9211

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-28 20:15:35 -05:00
Jared Camins-Esakov
ac723d8e9b Merge branch 'bug_9272' into 3.12-master 2012-12-28 20:13:40 -05:00
Jonathan Druart
85c3d9409f Bug 9272: Eliminate error when deleting authorized value
Try to delete an authorized value. if you don't get any error, this
patch works.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Enabled debug, tried with and without Plack, works fine for both.

Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Works as advertised. Follows coding guidelines.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-28 20:10:55 -05:00
Jared Camins-Esakov
5a61a3bbfe Revert "Bug 8378 - <fine> syntax not working on overdues anymore"
This reverts commit 40f9914e60.

Per Colin's report (confirmed by Mathieu and Julian):
  "I've had some problems with this patch. With it applied I found
  overdues for multiple users getting the same user's overdue message
  text, eg user 1 gets their correct message but users 2, 3 and 4
  get it as well. reverting the patch corrected this. I've not tracked
  down the cause as yet."
2012-12-27 22:34:41 -05:00
Jared Camins-Esakov
fa87f18549 Merge branch 'bug_9284' into 3.12-master 2012-12-27 19:02:31 -05:00
04d9825717 Bug 9284 - JavaScript should follow rules recommended by JSHint
Coding style corrections to members.js:

- Mixed tab/space indentation converted to spaces.
- Converted "!=" and "==" to "!==" and "===" for comparisons with ''.
- Adding missing semicolons.

To test, create or edit a patron and confirm that validation hasn't been
broken by the changes to members.js: Invalid date, empty required
fields, guarantor popup, restricted-until field display, etc.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-27 19:02:07 -05:00
Jared Camins-Esakov
c3bf2b4a3c Merge branch 'bug_8299' into 3.12-master 2012-12-27 18:50:50 -05:00
dd5023e6d4 Bug 8299 - overdue_notice.pl shows error messages
fixes 2 warnings...

 Use of uninitialized value in pattern match (m//) at /usr/share/koha/bin/cronjobs/overdue_notices.pl line 659.
 Use of uninitialized value in pattern match (m//) at /usr/share/koha/bin/cronjobs/overdue_notices.pl line 670.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-27 18:50:12 -05:00
Jared Camins-Esakov
bfb0d7e130 Merge branch 'bug_8712' into 3.12-master 2012-12-27 18:40:45 -05:00
Srikanth Dhondi
932dbcea27 Bug 8712 - We should use WAI-ARIA guidelines to help with accessibility
Added title to the search box

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-27 18:40:36 -05:00
Jared Camins-Esakov
9837f19f10 Merge branch 'bug_6261' into 3.12-master 2012-12-27 18:37:28 -05:00
8fd75227fc Bug 6261 [Revised] Consolidate patron toolbar include files
The staff client has two almost identical include files which
can be consolidated: circ-toolbar.inc and members-toolbar.inc.
This patch marges the slight differences between them and
eliminates circ-toolbar.inc, that being the one which was used
on fewer pages.

In order to accommodate the different "destination" variable
for operations which redirect back either to circ or patrons,
circulation.pl defines "destination" in the template.

Revision corrects a redirect error in setstatus.pl which
predates this patch but which never showed up until now.

To test, perform various operations from the toolbar on at least
two pages: circulation.pl and moremember.pl.

Operations: Edit, add child, duplicate, change password, print (all
options), search to hold, renew, set permissions, delete, update child
to adult, and export checked-in barcodes. In most cases simply
confirming that the link takes you to the right place is enough.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-27 18:36:42 -05:00
Jared Camins-Esakov
25232635f5 Merge branch 'bug_9289' into 3.12-master 2012-12-27 18:33:29 -05:00
8857d4d728 Bug 9289 - Adjacent checkbox behavior broken on circulation.pl
This patch fixes the behavior of adjacent checkboxes in the list of
checkouts on circulation.pl. Checkboxes in both the "renew" and "check
in" columns should not be able to be checked at the same time.

A line was commented out (by me) which was necessary to this working
correctly. I'm guessing it was done in debugging and left by mistake.

To test, load a patron for checkout who has items checked out. You
should not be able to check boxes in both the "renew" and "check in"
columns in the same row, whether you click the checkbox itself or the
containing table cell.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-27 18:33:17 -05:00
Jared Camins-Esakov
7535f2bfa3 Revert "Bug 7167: New version for updatedatabase"
This reverts commit c9cb55ef47.
2012-12-27 14:02:56 -05:00
Jared Camins-Esakov
72f9f2239f Revert "Bug 7167 follow-up setting DBrevision, before pushing"
This reverts commit 49d6b750cd.
2012-12-27 14:02:55 -05:00
Jared Camins-Esakov
ed38cd441b Revert "Bug 7167: Followup: Removes useless global variables"
This reverts commit 754392ed88.
2012-12-27 14:02:54 -05:00