]> git.koha-community.org Git - koha.git/log
koha.git
11 years agoBug 10653: add unit tests for C4::RotatingCollections.pm
Kenza Zaki [Tue, 30 Jul 2013 11:43:19 +0000 (13:43 +0200)]
Bug 10653: add unit tests for C4::RotatingCollections.pm

The tests are wrap in a database transaction.

Test plan:
prove t/db_dependent/RotatingCollections.t
t/db_dependent/RotatingCollections.t .. ok
All tests successful.
Files=1, Tests=41, 20 wallclock secs ( 0.02 usr  0.01 sys +  0.41 cusr  0.02 csys =  0.46 CPU)
Result: PASS

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 12061f44beb46709e03d09f7ff61551fa9297b2e)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit eb0373c7eb6d1f0cb52155709c18e06c09ab55df)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit eb0373c7eb6d1f0cb52155709c18e06c09ab55df)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 338e966d651ca6c00bd8d04c7d24099ca00d1b84)

11 years agoBug 8887: only display desired result when doing exact syspref search
Marc Veron [Sun, 7 Oct 2012 17:54:44 +0000 (19:54 +0200)]
Bug 8887: only display desired result when doing exact syspref search

This patch fixes an issue where entering the complete name of a system
preference when doing a syspref search in the staff interface resulted
in the display of *all* preferences belonging to the desired one's
module.

Since providing a more specific search string should result in getting
back more specific results, the previous behavior was not intuitive.

Test scenario:

a) In sysprefs, do a search with partial match (e.g. intranetcolor)
-> Result shows one entry: intranetcolorstylesheet
b) Do an exact search. e.g. intranetcolorstylesheet
-> Result shows all Staff Client preferences

Apply patch, test again. Now b) behaves like a).

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passes koha-qa.pl, works as advertised.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 9bc53a0fccc3b673dca43791ebfcb53fd6e0a9ee)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit a4dbe6821d167908792a7665c492d0e2976aaa0a)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit a4dbe6821d167908792a7665c492d0e2976aaa0a)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 17fefb868bddf997d90799de5f9190f330c20aac)

11 years agoBug 10481: (follow-up) fix typo in POD
Galen Charlton [Fri, 16 Aug 2013 15:00:35 +0000 (15:00 +0000)]
Bug 10481: (follow-up) fix typo in POD

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 1e84b1217afc74f490423538b7b8808e3d34513a)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 5fde0910787f9c36caedfc12bc5af6dfedc7df36)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 5fde0910787f9c36caedfc12bc5af6dfedc7df36)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 3ae20f0a2de91bfe8318df9a63c2bd73da71de25)

11 years agoBug 10481: Unit tests for C4::Members::AddEnrolmentFeeIfNeeded
Jonathan Druart [Thu, 11 Jul 2013 09:45:06 +0000 (11:45 +0200)]
Bug 10481: Unit tests for C4::Members::AddEnrolmentFeeIfNeeded

prove t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t
t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t .. ok
All tests successful.
Files=1, Tests=3,  0 wallclock secs ( 0.02 usr  0.00 sys +  0.38 cusr
0.01 csys =  0.41 CPU)
Result: PASS

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 1c8efaf3f9b14caf5f6512149d5fcd957bd3e487)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit af6c169f2a68296d99ad7f6908e441ababb79c98)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit af6c169f2a68296d99ad7f6908e441ababb79c98)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 9fc0c233dc5b180c3c7f3d92fdfc383c51bb2825)

11 years agoBug 10481: FIX No enrollment fee when changing patron category.
Jonathan Druart [Mon, 17 Jun 2013 12:56:22 +0000 (14:56 +0200)]
Bug 10481: FIX No enrollment fee when changing patron category.

When a patron changes to a category with enrollment fee, they
are not generated.

Test plan:
- Choose a category without fee (e.g. Kid)
- Add an enrollment fee for another category (e.g. Young adult)
- Choose a kid and change his category to "Young adult".
- Note the warning message "Fees & Charges: Patron has Outstanding fees
  & charges of XX" on the check out page.

This patch also moves all instances of adding the enrollment fee
to a new routine in C4::Members, AddEnrolmentFeeIfNeeded(), so
additional tests include:

- Register a new patron and give it a category that has
  an enrollment fee.  Verify that the fee is charged.
- Renew the patron.  Verify that the additional fee is charged.
- Register a new patron with a child patron category.
- Use the 'update child to adult' menu option to change the
  patron's category to one that is fee-bearing.  Verify that the
  enrollment fee was charged.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit f8eb19163bd4e59e99b6dae90a5712b6a7be52f6)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 98397ed4b10b03fb0b00e9550b571c3cc47407dc)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 98397ed4b10b03fb0b00e9550b571c3cc47407dc)

11 years agoBug 10703: Add db documentation for biblioimages table
Nicole C. Engard [Thu, 8 Aug 2013 12:49:25 +0000 (08:49 -0400)]
Bug 10703: Add db documentation for biblioimages table

This patch adds db documentation to the biblioimages table.

To test:

Apply patch
Review kohastructure.sql to be sure that the documentation is there

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 801d8237d80d7079f3355da18ef18c60b7f37325)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 6f55deac4a976b59edd13632e11f70cbfbd22642)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 6f55deac4a976b59edd13632e11f70cbfbd22642)

11 years agoBug 10715 - MARC21 007 Plugin Editor doesn't load position 01
David Cook [Tue, 13 Aug 2013 02:16:28 +0000 (12:16 +1000)]
Bug 10715 - MARC21 007 Plugin Editor doesn't load position 01

This patch changes the MARC21 007 plugin editor so that it uses
1 character instead of 4 characters for position 01.

TEST PLAN:

1) Create new record/edit an existing record
2) Using the tag editor for the 007 field, choose "Videorecording"
3) Click OK
4) Change the second character in the 007 from "c" to "d"
5) Open the tag editor again
6) Note that position 01 will still say "c - Videocartridge" rather
than "d - Videodisc".
7) Exit tag editor

8) Apply patch

9) Reload the page (Shift + Refresh is always useful)
10) Open the tag editor again
11) Note that position 01 will now say "d - Videodisc"

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 73ac970f734b0f04fff5561aa35bb9d9d47aa943)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Fix worked as expected.
(cherry picked from commit 8a407d8d02463cd15423735dc6030da2c8f5e3a7)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 8a407d8d02463cd15423735dc6030da2c8f5e3a7)

11 years agoBug 10483: fix item uniqueness check on order form
Fridolyn SOMERS [Mon, 17 Jun 2013 15:01:33 +0000 (17:01 +0200)]
Bug 10483: fix item uniqueness check on order form

When syspref "UniqueItemFields" is defined, the item uniqueness is
tested in acquisition by an AJAX call to check_uniqueness.pl.  This
patch fixes an issue where check_uniqueness.pl wasn't looking
at the correct CGI parameters.

Test plan :
- Select an existing item with barcode
- Add "barcode" to "UniqueItemFields" syspref (use space as separator
  for multiple values)
- Set "AcqCreateItem" syspref to "Create an item when placing an order"
- Go to an acquisition basket
- Create a new order from empty
- Enter existing barcode in item form and save
=> You get an alert that barcode already exists and order is not saved
- Enter a non-existing barcode in item form and save
=> Order and item are created

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 1c9135262b9233f59fd05e34c90980e7dc8be338)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit df428a49e5c8b9106771d308bd1c1dea62d64429)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit df428a49e5c8b9106771d308bd1c1dea62d64429)

11 years agoBug 10664 [QA Followup] - fix error in overdue_notices.pl if there is no active currency
Kyle M Hall [Fri, 16 Aug 2013 11:21:10 +0000 (07:21 -0400)]
Bug 10664 [QA Followup] - fix error in overdue_notices.pl if there is no active currency

Fixes the following koha-qa.pl error:
 FAIL   misc/cronjobs/overdue_notices.pl
    OK     pod
    OK     forbidden patterns
    OK     valid
    FAIL   critic
               # Variables::ProhibitConditionalDeclarations:

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit e476378323eb8dd31e67e4741d271d88de61b59e)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 22f96c6ebeb77da5efe7285d1980ce705e22726e)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 22f96c6ebeb77da5efe7285d1980ce705e22726e)

11 years agoBug 10664: fix error in overdue_notices.pl if there is no active currency
Sophie Meynieux [Wed, 31 Jul 2013 06:04:25 +0000 (08:04 +0200)]
Bug 10664: fix error in overdue_notices.pl if there is no active currency

If there is no active currency, when running overdue_notices.pl
you get a sofware error "Can't use an undefined value as a HASH
reference" on GetCurrency() function call.

With this patch, if there is no active currency, fines are formated
by default 0.00 and notices are correctly generated.

Test plan :
- have at least one borrower with overdue that should trigger a notice
- verify that there is no active currency (Adminitration > Currency &
  Exchange rates)
- run misc/cronjobs/overdue_notices.pl -v -n (to get the notice directly
  on output)

=> without the patch you get the software error
=> with the patch, notices are correctly generated

If an active currency is defined, the script overdue_notices.pl runs
the same with or without patch

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit a9a3bb7b3d7e8e862cf0f772246667258a20b786)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 5e12ca5684ee19c54685a4dc935fb242eaf0c3bc)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 5e12ca5684ee19c54685a4dc935fb242eaf0c3bc)

11 years agoBug 10362: ensure that all messages and alerts are shown upon checkin
Fridolyn SOMERS [Tue, 28 May 2013 13:43:05 +0000 (15:43 +0200)]
Bug 10362: ensure that all messages and alerts are shown upon checkin

If an item is returned and has mutiple error or warnings (e.g.,
it both needs to be transferred and the patron was debarred
in the course of the return), because of a bug in the template,
not all of the messages would be displayed.

This patch changes the template to show both messages and alerts.

Test plan :
- Perform an checkout that will a checkin :
  * need a transfert (return in a different branch)
  * set user debarred (depends on issuing rules)
- Perform check-in
=> You get tranfert message and debarment alert

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 5192fd81adaccf9b0f4a01dcc0ffc689edc9468f)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 8525d49e0601c85807235c007f712666c2abbceb)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 8525d49e0601c85807235c007f712666c2abbceb)

11 years agoBug 10712: Save missing config variables to install log
Colin Campbell [Mon, 12 Aug 2013 15:15:37 +0000 (16:15 +0100)]
Bug 10712: Save missing config variables to install log

The variables for AUTH_INDEX_MODE and ZEBRA_TOKENIZER were not
being saved to the koha_install_log file.  As a result when using the
--prev-install-log option in Makefile.PL the user was still prompted
to select them.

This patch adds the appropriate variables to the list saved in
the install log.

To test:

On a (non-package) system installed/upgraded without the patch running
'perl Makefile.PL --prev-install-log /path/to/koha-install-log' will
still prompt you to choose authorities indexing mode and select
between chr and icu, after upgrading with this patch applied the same
command should get the responses from the install log and not require
user intervention.

The values can be seen written into misc/koha-install-log

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 40e6f6a8f22b8af7adef79a0ece80a61a69ccc50)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 521d260a5931119c688fd872c30041ffe1c5c692)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 521d260a5931119c688fd872c30041ffe1c5c692)

11 years agoKoha 3.8.18 release v3.08.18
Chris Hall [Mon, 23 Sep 2013 09:09:06 +0000 (21:09 +1200)]
Koha 3.8.18 release

11 years agoRelease notes for 3.8.18
Chris Hall [Mon, 23 Sep 2013 09:08:45 +0000 (21:08 +1200)]
Release notes for 3.8.18

11 years agoTranslation updates for 3.8.18
Bernardo Gonzalez Kriegel [Sun, 22 Sep 2013 02:11:09 +0000 (23:11 -0300)]
Translation updates for 3.8.18

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
11 years agoBug 10644: (follow-up) remove inadvertant dependence on Perl 5.14
Galen Charlton [Fri, 9 Aug 2013 18:53:20 +0000 (18:53 +0000)]
Bug 10644: (follow-up) remove inadvertant dependence on Perl 5.14

Perl 5.14 changed array and hash container functions (e.g., keys())
to accept hashrefs or arrayrefs.  However, this doesn't work in
Perl 5.10, so doing

  scalar(keys( function_returning_hashref() ) );

is a syntax error in that version.  This patch changes the affected
tests to explicitly difference the hashrefs returned by the various
functions.

To test:

Verify that t/db_dependent/ClassSource.t passes.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 8f933bc040e8e4198f5278253191a7a4233467ce)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 9504e00f7b497aa8e49567ca99cf73f7c32ad134)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 9504e00f7b497aa8e49567ca99cf73f7c32ad134)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 4e474580b16024d6a6afc36bf220ebab034cb26a)

11 years agoBug 10643: fix inappropriate uses of $sth->finish() in C4::ClassSource.pm
root [Thu, 25 Jul 2013 12:03:32 +0000 (14:03 +0200)]
Bug 10643: fix inappropriate uses of $sth->finish() in C4::ClassSource.pm

This patch gets rid of finish() and replace prepare_cached by prepare.

From the man page

finish()
Indicate that no more data will be fetched from this statement handle
before it is either executed again or destroyed.
You almost certainly do not need to call this method.

Adding calls to "finish" after loop that fetches all rows is a common
mistake, don't do it, it can mask genuine problems like uncaught fetch errors.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 5cba6457aa00f3f3b2038f70057df300d9c6b9c3)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit cfb48010ad23e50fc93d893963164a17d4208c7b)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit cfb48010ad23e50fc93d893963164a17d4208c7b)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 0a47d3444dfa749f5b9c99252cd129bc80cee54a)

11 years agoBug 10644: fix typos in test descriptions
Galen Charlton [Thu, 1 Aug 2013 15:09:39 +0000 (15:09 +0000)]
Bug 10644: fix typos in test descriptions

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit d9d8a8424dcd62988293920f7c67f7d0a01efc70)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 7e5c0a9a5f08e325e2e8a1fdb2fda72b76a3b1e9)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 7e5c0a9a5f08e325e2e8a1fdb2fda72b76a3b1e9)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 5c32b6e383f02a81e8eed8d5462b0a8119696903)

11 years agoBug 10644: add unit tests for ClassSource.pm
Kenza Zaki [Fri, 26 Jul 2013 07:55:43 +0000 (09:55 +0200)]
Bug 10644: add unit tests for ClassSource.pm

The tests are wrapped in a database transaction.

To test:
prove t/db_dependent/ClassSource.t
t/db_dependent/ClassSource.t .. 1/24 prepare_cached(SELECT * FROM `class_sort_rules` WHERE `class_sort_rule` = ?) statement handle DBI::st=HASH(0x92dbedc) still Active at C4/ClassSource.pm line 249
prepare_cached(SELECT * FROM `class_sources` WHERE cn_source = ?) statement handle DBI::st=HASH(0x926876c) still Active at C4/ClassSource.pm line 137
attempting to use non-existent class sorting routine routine1
prepare_cached(SELECT * FROM `class_sort_rules` WHERE `class_sort_rule` = ?) statement handle DBI::st=HASH(0x92dbedc) still Active at C4/ClassSource.pm line 249
prepare_cached(SELECT * FROM `class_sources` WHERE cn_source = ?) statement handle DBI::st=HASH(0x926876c) still Active at C4/ClassSource.pm line 137
t/db_dependent/ClassSource.t .. ok
All tests successful.
Files=1, Tests=24,  0 wallclock secs ( 0.02 usr  0.00 sys +  0.12 cusr  0.01 csys =  0.15 CPU)
Result: PASS

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 5de06b87e29f12250a35df3239372a7ed0754811)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit aeb11a6a9236bcf7f6c822a55e3d270406956db2)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit aeb11a6a9236bcf7f6c822a55e3d270406956db2)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit b976a45151d93e311cf375739ffe717143e99706)

11 years agoBug 10621: use correct from-address for subscription alert emails
Mirko Tietgen [Tue, 23 Jul 2013 21:24:11 +0000 (23:24 +0200)]
Bug 10621: use correct from-address for subscription alert emails

From-address and to-address were the same (patron's email) for
subscription alerts. This patch changes 'from' the branch or
kohaadminemailaddress

To test
- add a subscription in staff/serials in case you don't have any
- enable patron notifications or the subscription
- in the OPAC, subscribe to the serial
- in staff/serial, receive an issue of the serial

Before applying the patch, the email that is supposed to be sent
has the patron's email as 'from' and 'to' (and is likely to fail).

If you follow the steps after applying the patch, the email alert
should have the 'from' address of the patron's branch or
kohaadminemiladdress -- which should also work fine with the MTA/SMTP
you have set up for messaging.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 61fa246ac06d637d50c8eed68244f0577ed34e4d)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 75b31bb5cf4a6269dedeb95be374b654fe4b5091)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 75b31bb5cf4a6269dedeb95be374b654fe4b5091)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit eaefa5daf65161c9f7c99ab1340bbc97075450e6)

11 years agoBug 10516 - Follow up - Fixing capitalization
Katrin Fischer [Sun, 21 Jul 2013 09:50:09 +0000 (11:50 +0200)]
Bug 10516 - Follow up - Fixing capitalization

Fix capitalization on submit buttons when deleting
a Z39.50 server.

- Delete this Server
- Do Not Delete

I think the "Do not delete" should maybe even be a cancel
link to be more consistent with how Koha displays this
kind of dialog in other places.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
fixes capitalisation, tool stil works

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit c5cc04ef3d5e50c376e37a1493926181389efa6a)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 14a4abebed9df1acc67a08685be368e060a2d310)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 14a4abebed9df1acc67a08685be368e060a2d310)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit e0e2a2e87635834cc77f94b5e8b7edb100e60d70)

11 years agoBug 10516 - Improve titles, breadcrumbs, and confirmation messages for Z39.50 server...
Owen Leonard [Fri, 28 Jun 2013 19:10:14 +0000 (15:10 -0400)]
Bug 10516 - Improve titles, breadcrumbs, and confirmation messages for Z39.50 server adds and updates

The template for adding/editing Z39.50 servers shows the same title,
breadcrumbs, etc. for add and edit operations. This patch creates
separate text for each case.

To test, try both adding and editing a Z39.50 server. The page title,
breadcrumb, and heading should correctly reflect the operation you
perform.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely and all strings are translatable.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 5c60ae40f97d9c22504c2942a00a93777984c7a5)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 1d7490b6e50d0cdfd08124f5ca46eca4547d5ca6)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 1d7490b6e50d0cdfd08124f5ca46eca4547d5ca6)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit e1227835ad9c2eaf71c8794b91ba3a921ee7f3b8)

11 years agoBug 10189: Translate values in UNIMARC 128b/c cataloguing plugins to English
Mathieu Saby [Fri, 3 May 2013 21:07:37 +0000 (23:07 +0200)]
Bug 10189: Translate values in UNIMARC 128b/c cataloguing plugins to English

Cataloguing plugins for UNIMARC 128b and 128c fields are only in Ffrench.

This patch translates them.
Source : http://blue.lins.fju.edu.tw/mao/marc/unicon.htm
Note : 128b and 128c are deprecated in last version of UNIMARC Manual (field 145 used instread).
But they are still used in French Sudoc network.

To test : in a UNIMARC english Koha, edit a record and use 128b and 128c
cataloguing plugins. Check everything is in english.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Thx for translating those!
Verified new strings get parsed into the po files.
Templates still contain lots of tabs, those can be fixed separately.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 80ea8bf821ba83fd4506f5298f5a582051b44e06)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit df765f82b3b96e9bf4e883450d1e3260cce01dfd)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit df765f82b3b96e9bf4e883450d1e3260cce01dfd)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 025d62226daba0cd3c4038d8984ab2b9b8422e23)

11 years agoBug 10507: improve warning about duplicate patron attribute value
Colin Campbell [Tue, 9 Jul 2013 10:18:49 +0000 (11:18 +0100)]
Bug 10507: improve warning about duplicate patron attribute value

If a warning about a duplicated patron attribute is returned,
the value was being passed back for display in the warning
message with the same name as the variable in errors

As the message is displayed in the context of errors
the error value 1 was being displayed not the value
duplicated as intended.

Pass the value to the template with a unique name.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I fixed another tiny typo while signing off: "is already in use" instead
of "is already is use."

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passes koha-qa.pl, works as advertised.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 2614e07e1e2e6386b5f91e65f127940072e54d4d)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit b3bf4592a534a5c9824bdd54c6c0b354c3d34f61)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit b3bf4592a534a5c9824bdd54c6c0b354c3d34f61)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit e9fc5c04e75f1444fdb26d2fc2228605b82f5807)

11 years agoBug 4907: make 'Organize by' filter in suggestions reflect selected option
Katrin Fischer [Mon, 1 Jul 2013 21:44:39 +0000 (23:44 +0200)]
Bug 4907: make 'Organize by' filter in suggestions reflect selected option

When using the 'Organize by' option to change the display of the
suggestions, the option is applied, but the pull down always jumps
back to the first entry 'Status'.

This patch fixes that.

To test:
- Try out all settings and verify that after the page reloads the selected
  option is applied to your suggestions and the pull down shows
  the option you selected.

Note: Until bug 10519 is properly fixed the tabs will not show
the correct descriptions, but the URL will show you the selected
option as parameter: displayby=acceptedby

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 60a4dffbb197fe92e7483b9e0dfcc19bc9b51664)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 5207c513c36fb0e66ed5a8390fc30119e194fad1)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit a05d90ff054785cebf82c9ecc6cfaff1e64c4df9)

11 years agoBug 5858: Followup for INSERT IGNOREs in marc21_framework_DEFAULT.sql
Marcel de Rooy [Sun, 7 Jul 2013 12:40:19 +0000 (14:40 +0200)]
Bug 5858: Followup for INSERT IGNOREs in marc21_framework_DEFAULT.sql

Changes 8 INSERTs into INSERT IGNOREs.
This allows current installs to benefit easier from the new tags/subfields.
Note that running with --force will not achieve the same! The multi-value
inserts will still be aborted, though execution continues.

Test plan:
Run the file or do a new install.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Ran the file on a current install manually.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit bf9eccfeb8069c1b258916c1916138b6317122da)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit bfd82695b19ce20cd638e8c285e7e1aeed89a255)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit bfd82695b19ce20cd638e8c285e7e1aeed89a255)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit c0879481a4ad4bd32fbb00530115bea5fa0bdbc0)

11 years agoBug 5858: update default MARC21 framework to April 2013 revision
Bernardo Gonzalez Kriegel [Wed, 20 Mar 2013 00:25:20 +0000 (21:25 -0300)]
Bug 5858: update default MARC21 framework to April 2013 revision

Applies to new installs, although with the follow-up
patch, users can run the installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
script through the mysql client to add new tag and
subfield entries.

To test:
1) Delete MARC21 default framework
2) Apply patch
3) Test that new default framework loads without problem

Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Run this file with and without this patch.
This patch adds 24 tags (338 vs 314) and 323 subfields (3951 vs 3628).
Verified that last QA comments were incorporated.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 45669b2566c889c7a73251cdb132c81cf5127117)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 689080867eb810279a912f2d9bf7a78655ffc9dd)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 689080867eb810279a912f2d9bf7a78655ffc9dd)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit a582ba6100c1e5aae9aca5f11d22d3eb564f22ae)

11 years agoFollowup Bug 9353: Missing subfields on MARC21 frameworks
Bernardo Gonzalez Kriegel [Thu, 10 Jan 2013 22:01:07 +0000 (19:01 -0300)]
Followup Bug 9353: Missing subfields on MARC21 frameworks

This followup changes updatedatabase.pl.
Only touch frameworks that have the missing subfields.

If both patches are applied, the test plan changes.

To test:
1) dev master system with default and example MARC21 frameworks
2) Go to Home > Administration > MARC frameworks
3) Click on 'MARC structure' of any framework
4) Search for tag 029 (or 863/4/5)
5) Click 'Subfields', there are none.
6) Apply both patches
7) run 'perl installer/data/mysql/updatedatabase.pl'
8) Repeat steps 2-4
9) Click 'Subfields', now they are.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Update works nicely. Checked various frameworks and
results were ok. Also new fields are hidden.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit da4bc6a6315a7f5aca1bb3105549758b8acd7592)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit da4bc6a6315a7f5aca1bb3105549758b8acd7592)
Solved conflict in updatedatabase.pl
This two are necessary for Bug 5858
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 459422c8bad09a8301cf47a7b39abf15a3b265ff)

11 years agoBug 9353 - Missing subfields on MARC21 frameworks
Bernardo Gonzalez Kriegel [Sat, 5 Jan 2013 20:46:34 +0000 (17:46 -0300)]
Bug 9353 - Missing subfields on MARC21 frameworks

This patch adds missing subfields on MARC fields

029abct
(http://www.oclc.org/bibformats/en/0xx/029.shtm)

863abcdefghijklmnopqstvwxz68 (same for 864/5)
(http://www.loc.gov/marc/holdings/hd863865.html)

To test:
1) dev master system with default and example MARC21 frameworks
2) Go to Home > Administration > MARC frameworks
3) Click on 'MARC structure' of any framework
4) Search for tag 029 (or 863/4/5)
5) Click 'Subfields', there are none.
6) Apply the patch
7) Replace old frameworks, easiest by command line:
mysql -uuser -ppass kohadb -e 'delete from biblio_framework; delete from marc_tag_structure; delete from marc_subfield_structure'
mysql -uuser -ppass kohadb < installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
mysql -uuser -ppass kohadb < installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
8) Repeat steps 2-4
9) Click 'Subfields', now they are.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Updated frameworks are ok.
Note: Only en frameworks are updated, so if other languages need
those fields too, we need some followups.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit d0f3a49d9672cd018a51168b05db7a9d1f17f250)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit d0f3a49d9672cd018a51168b05db7a9d1f17f250)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit e22738e3b16593ef5282b493818fe220fb889d24)

11 years agoBug 10346 - "Add multiple copies" should be labelled "Add multiple items"
Owen Leonard [Wed, 5 Jun 2013 18:03:51 +0000 (14:03 -0400)]
Bug 10346 - "Add multiple copies" should be labelled "Add multiple items"

The Koha interface standardizes on the term "item" instead of "copy," so
the "Add multiple copies" button would be more correctly labeled "Add
multiple items."

To test, view the add item screen for an existing or new record. You
should see a button labeled "Add multiple items."

Signed-off-by: Cedric Vita <cedric.vita@dracenie.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 79df5211d6faff8ab31b46c815ed50c70093a057)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 7000aa561c7fb33c422f9b60c4f7590a6071ee08)

Solved Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 7000aa561c7fb33c422f9b60c4f7590a6071ee08)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit d1844855efba1b4121dac160d130cdb7d7720c13)

11 years agoBug 7598: [Follow-up] make strings in acquisitions JavaScript translatable
Owen Leonard [Thu, 18 Jul 2013 15:30:35 +0000 (11:30 -0400)]
Bug 7598: [Follow-up] make strings in acquisitions JavaScript translatable

This follow-up addresses QA comments and moves punctuation and line
breaks out of the string to be translated.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit b38187d8b004316b17d1e67753d638e96bb62bb8)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit c4bf7d825141261a8a1563790f4e4a767647a779)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit c4bf7d825141261a8a1563790f4e4a767647a779)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit bcd6b896ea3e10c73cca4b34d9030024205b784b)

11 years agoBug 7598: make strings in acquisitions JavaScript translatable
Owen Leonard [Mon, 10 Sep 2012 12:34:33 +0000 (08:34 -0400)]
Bug 7598: make strings in acquisitions JavaScript translatable

English strings in acq.js cannot be processed by the translation script.
This patch moves the strings to the templates to be set as JS variables
for use by the script.

To test:

- On the uncertain prices page, enter an invalid price and click save.
  You should see a JavaScript alert pointing this out.

- When adding a fund to an existing budget, enter an amount which
  exceeds the amount in the parent budget. You should see a JavaScript
  alert pointing this out. There is a similar function which has been
  corrected, checkBudgetParent(), but I don't know how to trigger it for
  testing.

The closebasketgroup function has been updated but as far as I can tell
it's not actually in use.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit f69e13665da007a6ab28e4c1d5a7d1a50f3ac3ac)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit d8eeb697c873b1ba9366bbce275a14d004931f40)

Conflicts:

koha-tmpl/intranet-tmpl/prog/en/js/acq.js

Solved.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit d8eeb697c873b1ba9366bbce275a14d004931f40)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 297e7fa540d8b6eddf5289c37865844dcf258d09)

11 years agobug 7143: add latest batch of committers
Galen Charlton [Mon, 22 Jul 2013 14:40:58 +0000 (14:40 +0000)]
bug 7143: add latest batch of committers

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit ee224415b7c8b5e31f9c052e1c14a143ab137898)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 11ad663a50979c2aa20aabaa986a8660381f37c0)

Conflicts:

koha-tmpl/intranet-tmpl/prog/en/modules/about.tt

Solved minor conflict.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 11ad663a50979c2aa20aabaa986a8660381f37c0)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 3dec7977189b7b8549128e4fec151b7a654d2a3a)

11 years agoBug 7143 - Updating history and about page
Tomas Cohen Arazi [Mon, 8 Jul 2013 16:15:01 +0000 (13:15 -0300)]
Bug 7143 - Updating history and about page

First commit from Silvia Simonetti, went into the 3.12.x branch.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 224d878cf76813c5f8f229031ef916f1f73fd975)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 53494812ff1b9a00e3d541e4744ccb96ae297fca)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 53494812ff1b9a00e3d541e4744ccb96ae297fca)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 7b5141e9501550918741b02b55f1b49706240f7b)

11 years agoBug 9801: display facet labels in search results only when there are facet values
David Cook [Thu, 27 Jun 2013 06:02:08 +0000 (16:02 +1000)]
Bug 9801: display facet labels in search results only when there are facet values

Currently, the headings for facets (such as location) are showing even
if there are no actual values/links for that facet type.

This patch simply checks if the facet array contains any facets before
printing the heading and HTML for each facet value/link.

Test Plan:

Before applying:

0) If you want to check the location facet (which is easiest),
enable singlebranch  mode in the globals system preferences.

1) Do a search for records/items that you have no shelving location
specified (or simply remove the shelving location for a small range
of records that you can find in a search query).

2) Note that "Location" appears amongst the facets even though there
are no values/links present. (If you look at the HTML source, you'll
see some empty HTML tags have been printed out.)

Apply patch.

3) Flush your cache and refresh your page.
4) You should no longer see a "Location" facet (or those empty HTML
tags) on the facet sidebar.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template changes only.
Checked according to test plan, made sure location facet
still shows up when values exist, otherwise it's hidden.

It might make sense to add ids to the facets so libraries
can decide to hide some of them easily. Or alternatively
add a system preference to make that possible.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit f01606d89b487d585bf06eae1dd6de6ff138eab9)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 8871a6a2add5cbdef3a46267a54fc78ddf995687)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 8871a6a2add5cbdef3a46267a54fc78ddf995687)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 270cc499c3dde4ef22e395d8dc3f40ebb1e6907e)

11 years agoBug 10457: fix SQL error when using 'export select items data' in serials claims...
David Cook [Thu, 13 Jun 2013 06:46:46 +0000 (16:46 +1000)]
Bug 10457: fix SQL error when using 'export select items data' in serials claims page

Currently, if you use the "check all" checkbox next to the "Vendor"
table header, and try to "Export selected items data", you'll
see the following SQL error in the Apache error log:

DBD::mysql::st execute failed: You have an error in your SQL syntax;
check the manual that corresponds to your MySQL server version for
the right syntax to use near 'on ORDER BY title' at line 12 at
/.../lib/C4/Serials.pm line 1828.

This is because the Javascript that produces the re-direct URL is
including the value of the checkall checkbox, which is "on",
as a "serialid".

We need to only take checkboxes with a name of "serialid" when
crafting the re-direct link.

This patch adds the [name=serialid] attribute selector to the Jquery
that creates the URL to lateissues-excel.pl from claims.pl.

Test Plan:

Before applying the patch:

1) Go to Serials > Claims (found on the left navigation bar of Serials)
2) Choose a vendor that has serials to claim (or create some late
serials for a vendor so that they will show up)
3) Click on the checkbox to the left of the "Vendor" table heading.
4) Click "Export selected items data" at the bottom of the page
5) Check the Apache error log.  Notice that you'll get a SQL error
   like the one in the message above.

Apply the patch.

Repeat Steps 1-4.

Note that you should now have a CSV file downloading rather than
getting a SQL error.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 3834d1f2b4494d465c6d1ab72aa334100898a756)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit fdb1d099c5489f200b7b36125ed4ccddd00e3d4c)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit fdb1d099c5489f200b7b36125ed4ccddd00e3d4c)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 9643d6ca30315cae2a2732b0bc84e0a63797261a)

11 years agoBug 10553: make public lists available on OPAC login page
Owen Leonard [Mon, 8 Jul 2013 18:37:03 +0000 (14:37 -0400)]
Bug 10553: make public lists available on OPAC login page

If you are not logged in to the OPAC, looking at the login page, and you
click the Lists button to see public lists it says there are none. This
patch corrects Auth.pm so that it loads the list of public lists in this
situation.

To test you must have at least one public list. Make sure you are logged
out of the OPAC and visit the login page (/cgi-bin/koha/opac-user.pl).
Clicking the "Lists" button should show you a list of public shelves.

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
works as described, and list button is not shown when opacpublic is disabled.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 651f810f68f82f4aac254c4a78bb6a4517dcb558)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit c7e19ee643730b06dc0f0ab2665c31f65b8e86e4)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit c7e19ee643730b06dc0f0ab2665c31f65b8e86e4)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 41f7a40ea7cdcc628b3e369cf8480e6b6e81f030)

11 years agobug 10559: remove spurious "statement handle still active" warnings
Galen Charlton [Tue, 9 Jul 2013 17:53:16 +0000 (17:53 +0000)]
bug 10559: remove spurious "statement handle still active" warnings

Generating (e.g.) overdue notices can result in spurious warnings in
the cronjob logs:

$ ./misc/cronjobs/overdue_notices.pl -t -library CPL
prepare_cached(SELECT * FROM issues WHERE     itemnumber = ?) statement handle DBI::st=HASH(0x54a7828) still Active at C4/Letters.pm line 589

This patch removes the warning by making sure that the relevant statement
handle is finished after fetching its first row of results.

To test:

[1] Set up an overdue loan such that running overdue_notices.pl will
    trigger the generation of a notice.
[2] Run overdue_notices.pl -t and note the warning message.
[3] Apply the patch.
[4] Run overdue_notices.pl -t again and note that the warning message
    is no longer displayed.
[5] Check the message_queue table and verify that the overdue
    notices generated in steps 2 and 4 have the same text.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 2bab95cac5f43b034adec36ec62a8c8f7f520627)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 5e7452758949e037fcf286cead721b559dd7d0e3)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 5e7452758949e037fcf286cead721b559dd7d0e3)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit cca7c4fbde1ba5074937251d9fd3c8b3d86deef7)

11 years agoBug 10595: don't display OpacTopissue page when system preference is turned off
Mirko Tietgen [Tue, 16 Jul 2013 19:51:01 +0000 (21:51 +0200)]
Bug 10595: don't display OpacTopissue page when system preference is turned off

When the syspref is turned off, the link is hidden but the page is still
accessible. This patch checks the syspref and redirects to 404 if it is disabled.

Test plan:

Before applying the patch

Enable OpacTopissue
  Observe there is a link to opac-topissues.pl next to Advanced search etc.
  Follow that link, observe that opac-topissues.pl is loading
Disable OpacTopissue
  Observe the link is gone
  Manually open /koha/opac-topissues.pl and check that it is loading even though the feature is disabled

Apply patch

(OpacTopissue still diabled)
Manually open /koha/opac-topissues.pl and observe that you are being redirected to the 404 page.
Enable OpacTopissue
  Follow the link or manuall open opac-topissues.pl and check that it is working

Signoff the patch.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 04ca81bc358f1bc6425e1cef431d9e4abfc744d8)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Works as expected
(cherry picked from commit 094bfd0d17689c92a4e9366af63ffb7fcbe99399)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 094bfd0d17689c92a4e9366af63ffb7fcbe99399)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit d92e6c746de1060a34631f4a0eea7bc71b110cd8)

11 years agoBug 10549: (follow-up) make sure ILS-DI GetAvailability response is emitted as UTF-8
Galen Charlton [Wed, 17 Jul 2013 19:12:34 +0000 (19:12 +0000)]
Bug 10549: (follow-up) make sure ILS-DI GetAvailability response is emitted as UTF-8

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit da6f2f7a7ddf1126d6e3b02825f0d45948f484fa)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 1ebaaa8c4b3c27afa9fd2ef67a9430fafb82b544)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 1ebaaa8c4b3c27afa9fd2ef67a9430fafb82b544)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 99706d790038e6bc0ea230f803946cd41845ddaa)

11 years agobug 10549: make the ILS-DI services advertise that they return UTF-8
Mirko Tietgen [Sat, 6 Jul 2013 21:48:54 +0000 (23:48 +0200)]
bug 10549: make the ILS-DI services advertise that they return UTF-8

This patch changes a few occurences of ISO-8859-1 to UTF-8
within the XML generation of the ILS-DI module.

To test:
- Activate ILS-DI system preference
- Go to [youropac]/cgi-bin/koha/ilsdi.pl
- Check all examples in the documentation for the correct
  encoding
- Check GetAvailability gives you the correct encoding and
  check the source for the correct encoding

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 2a1d0fc6d2d2674d4182ed1c6be557b568778834)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 795c8e9bd0fd2d6669582f12fdcaf3fe28acf553)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 795c8e9bd0fd2d6669582f12fdcaf3fe28acf553)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 325d4af93c155ff068a4912ce0435b85fa276ec1)

11 years agoBug 10541: enable cross-browser AJAX in additem.js
David Cook [Fri, 5 Jul 2013 02:00:36 +0000 (12:00 +1000)]
Bug 10541: enable cross-browser AJAX in additem.js

Currently, the additem.js is using "indexOf" to search
for a value in an array. While this works in Chrome, Firefox,
and IE > 9, it fails miserably in IE 8 and 7 (which don't have
the indexOf method). This means that users aren't able to add
items using the acquisitions module!

Instead of using "indexOf", we should be using the jQuery function
$.inArray. It was added in jQuery v1.2 (3.8.0 uses v1.3.2 so even
our oldest supported release can use this method). It's perfectly
cross-browser compatible...works in Chrome, Firefox, and every
version of IE that I've tried (i.e. 7, 8, 9).

Test Plan:

Before applying patch:

0) Switch to Internet Explorer 7, or 8, or 9, or 10.

If you're using IE 9 or 10, you'll need to change the Document Mode to
IE7 standards or IE8 standards.

You can do this by opening Internet Explorer 9 or 10, pressing F12 (or
clicking on the gear in the top right corner and choosing
F12 Developer Tools), and then clicking on "Document Mode" on the
top toolbar. There, you can change to IE7 or IE8 standards.

N.B. This is not always a perfect emulation in every case, but this
time it does show you the bug.

1) Set the system preference AcqCreateItem to "receiving an order"
2) Go to Acquisitions
3) Either:
    a) Receive a shipment for a basket with items
    b) Create a new basket, create an order, close the basket, and
       then do 3a)
4) In the "Item" fieldset, fill out some fields such as barcode,
   Date acquiried, Public note, etc.
5) Click "Add" at the bottom of the fieldset
6) Note that while the item may have been added, the "Item" fieldset
is not being shown again. You may also notice a Javascript error
appearing in a pop-up window or you might see a yellow warning flag
on the bottom status bar.

APPLY THE PATCH

7) Do a full refresh of the page (hold down shift and press the refresh
button on the browser next to the address bar), and try adding items
again.
8) Note that you receive no warnings and that items are added correctly
as they would be in Firefox or Chrome.

OPTIONALLY

9) To be sure that I haven't broken anything, go through the same steps
in IE9 (with IE9 standards) or Chrome or Firefox. Everything should be
working.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested in IE10 in IE7 mode and IE9 mode. Also tested in Firefox.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passes koha-qa.pl, works as advertised.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 53f82b1d7d9b7f06da1032faf0800d624eb4c1d3)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit afbe6a0f2c9b0d37327a57cf72eabfb7eebe156d)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit afbe6a0f2c9b0d37327a57cf72eabfb7eebe156d)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit bef4efbdc7e68b1c91b7234ba2d68ff5aeeb5131)

11 years agoBug 9362: fix query that finds upcoming due loans
Fridolyn SOMERS [Tue, 9 Jul 2013 15:38:04 +0000 (17:38 +0200)]
Bug 9362: fix query that finds upcoming due loans

C4:Circulation:GetUpcomingDueIssues is used in the advance_notices.pl
script.  This patch corrects an error in its handling of the maxdays
parameter that resulted in it picking up *all* upcoming due loans and
recently overdue loans.

Test plan :
- Create an issue with a date due in the paste
- Create an issue with a date due in two days
- Launch advance notices with due date in max 2 days : perl misc/cronjobs/advance_notices.pl -c -n -v -m=2
=> You get a warn "found 0 issues"
- Launch advance notices with due date in max 3 days : perl misc/cronjobs/advance_notices.pl -c -n -v -m=3
=> You get a warn "found 1 issues"

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
I did the following test :

- 1 book to check in 2 days
- 2 books to check in in the past

before applying the patch :

$perl ../misc/cronjobs/advance_notices.pl -c -n -v -m=2
getting upcoming due issues at ../misc/cronjobs/advance_notices.pl line 203.
found 1 issues at ../misc/cronjobs/advance_notices.pl line 205.

I changed the value of "-m" : 0, 1, 2, 3, 4
=> always 1 issue found (the book to check in in 2 days)

after applying the patch :

$perl ../misc/cronjobs/advance_notices.pl -c -n -v -m=2
found 0 issues
for m = 0, 1, 2 => 0 issues

$perl ../misc/cronjobs/advance_notices.pl -c -n -v -m=3
found 1 issues
for m = 3,4,5 => 1 issues (the book to check in in 2 days)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passes koha-qa.pl, works as advertised.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit ff7f37202949bb6d60cdf30de4e237e6b1de93eb)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit f40924b317e37757f1e552ab466dc840304c6182)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit f40924b317e37757f1e552ab466dc840304c6182)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit fb11fb31a4357777328b80fd5ad6ce5694823d11)

11 years ago3.8.17 release notes v3.08.17
Chris Hall [Sat, 24 Aug 2013 04:57:09 +0000 (16:57 +1200)]
3.8.17 release notes

11 years agoDatabase update for 3.8.17 release
Chris Hall [Sat, 24 Aug 2013 03:26:39 +0000 (15:26 +1200)]
Database update for 3.8.17 release

11 years agoTranslation updates for 3.8.17
Bernardo Gonzalez Kriegel [Fri, 23 Aug 2013 21:28:12 +0000 (18:28 -0300)]
Translation updates for 3.8.17

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
11 years agoBug 10563: Fix broken 'Edit' link on check expiration page
Katrin Fischer [Wed, 10 Jul 2013 20:43:41 +0000 (22:43 +0200)]
Bug 10563: Fix broken 'Edit' link on check expiration page

This fixes the broken 'Edit' (subscription) link on the
check expiration page in serials.

To test:
- Add a subscription
- Go to the check expiration page
- Search for your subscription, use an expiration date in the
  far future
- Verify the edit link on the result list doesn't work right
  before applying the patch, but works after

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 81431fdc8654e95e9fea37c4de880e9cf6126b26)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 61cbdb6ac7996d8d2f8045d12ec36c5f3676b694)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 61cbdb6ac7996d8d2f8045d12ec36c5f3676b694)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit cd33fd00d04dc4039729e65e0d4ae370a7cab89b)

11 years agoBug 10127 : Printoverdues.sh should tar only pdf files
Sophie Meynieux [Fri, 26 Apr 2013 13:06:40 +0000 (15:06 +0200)]
Bug 10127 : Printoverdues.sh should tar only pdf files

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
From the bug report:
At the end of printoverdues.sh, an archive is generated
containing all files present in  directory given as parameter.
As archives are generated in this given directory, they
contain previously generated tar files, creating oversized files.
Only .pdf files should be archived

All tests and QA script pass.
Worked ok in my tests, only packign PDF in the given directory.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 261c6f39fa234f8795e62eff48db85c9366d4268)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 261c6f39fa234f8795e62eff48db85c9366d4268)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit b5afa6669495df84275753c9f064d8c53cd3e142)

11 years agoBug 10556: The delivery time is not inserted on adding a supplier.
Jonathan Druart [Tue, 9 Jul 2013 09:52:31 +0000 (11:52 +0200)]
Bug 10556: The delivery time is not inserted on adding a supplier.

Test plan:
Add/edit a supplier and check that the delivery time is set in DB.

Note: This patch cleans the code (sql query) in order to see easily if a
problem occurred.

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit b95c3134a8a38ba430f7d70173f91e055b4fa30e)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 4251c1f8185bb91df17949b903391ad29d58f6f0)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 4251c1f8185bb91df17949b903391ad29d58f6f0)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit c8c5f74e65937a38f386c78716550deaf4e68da9)

11 years agoBug 10527: remove disused routine C4::Branch::get_branch_code_from_name
Jonathan Druart [Tue, 2 Jul 2013 10:56:21 +0000 (12:56 +0200)]
Bug 10527: remove disused routine C4::Branch::get_branch_code_from_name

This routine is not in used and does not make sense. It should not be
used later.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passes koha-qa.pl, not references to get_branch_code_from_name found.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 7d930649065663325de95c3f8ecdbcea3bddb3b5)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit aa15f7031bc7d9c0f2c9901db491dada53f21c65)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit aa15f7031bc7d9c0f2c9901db491dada53f21c65)

Conflicts:
C4/Branch.pm
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 1eb41a81ee0b07026e22d069279e1be2b37caae3)

11 years agoBug 10422 - Remove references to unused and non-existent wizard.css
Owen Leonard [Tue, 2 Jul 2013 13:59:21 +0000 (09:59 -0400)]
Bug 10422 - Remove references to unused and non-existent wizard.css

doc-head-close.inc contains a reference to "wizard.css" which doesn't
exist. The option to include it never evaluates as true, and that
section can be removed from the template.

To test, apply the patch and view any page in the staff client.
Everything should be styled as before. A search of the Koha source
should return no references to "wizard.css" or a "wizard" variable.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
No occurrence of "wizard" in pl/pm files.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passes koha-qa.pl

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 986f7a24e8abe566d57a3488a8df87488ab3aeb6)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit d359b05cb8958cd4d2a2681a86d7813a48748670)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit d359b05cb8958cd4d2a2681a86d7813a48748670)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 1252afb7bfa7833738065b6d6fc2d1c0990410ab)

11 years agoBug 9770: fix sorting of Dewey call numbers that contain prefixes
Jason Etheridge [Fri, 8 Mar 2013 15:41:06 +0000 (10:41 -0500)]
Bug 9770: fix sorting of Dewey call numbers that contain prefixes

C4::ClassSortRoutine::Dewey can pad the wrong part of a call number internally.

The subroutine get_class_sort_key tokenizes a call number string (splitting on
periods and whitespace) and counts the number of tokens that solely contain
digits.  If there is only one such digit group, a comment in the code states
that it will pad said digit group.  However, the bug is that the code assumes
said digit group is the first token, when this may not be the case.

In practice, this can cause poor sorting when used a call number is in the form
of PREFIX _space_ 3DIGITS.

To test:

[1] Create two item records whose class scheme is set to
    'ddc' (Dewey) and whose call numbers contain prefixes, e.g.,
    J DVD 700.1 ABC and J DVD 850 DEF.
[2] Use the inventory tool to produce a list of item items that include
    the two created in step 1.  Obsere that that items are sorted
    in the incorrect order, with "J DVD 850 DEF" coming before
    "J DVD 700.1 ABC".  Alternatively, run the following SQL
    to see the incorrect sort order:

    SELECT cn_sort, itemcallnumber
    FROM items
    WHERE itemcallnumber LIKE 'J DVD%'
    ORDER BY cn_sort;

[4] Apply this patch.
[5] Run misc/maintenance/touch_all_items.pl to force cn_sort to be
    recalculated.
[6] Repeat step 2 and verify that the call numbers are now sorted
    corrected.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit dba36a7a1216238a260ea5fbe2218627487e9f19)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit f05642589d94c25ef1b1f01b4a2606fe455400b8)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit f05642589d94c25ef1b1f01b4a2606fe455400b8)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 404a931efa9365ae084f088111382eb2076a0a7e)

11 years agoBug 9770: test case for sorting of Dewey call numbers that contain prefixes
Jason Etheridge [Fri, 21 Jun 2013 19:31:32 +0000 (15:31 -0400)]
Bug 9770: test case for sorting of Dewey call numbers that contain prefixes

This adds a test for C4::ClassSortRoutine::Dewey to check that the
call number "JR DVD 800.1" sorts before "JR DVD 900"

To test:

[1] Apply just this patch.
[1] Run prove -v t/ClassSortRoutine_Dewey.t
[2] Test #7 should fail.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes test plan and QA script.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit bce45b4bf55e82345efed2850d9cb5fd77f3c483)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 926e455f19852c1c7b69aa00bd587caff8bccd14)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 926e455f19852c1c7b69aa00bd587caff8bccd14)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 74b2f3fb4acec7b4adf54f32bb4eabcf51ca3353)

11 years agoBug 10448: can now change framework after duplicating bib record
David Cook [Wed, 12 Jun 2013 01:24:09 +0000 (11:24 +1000)]
Bug 10448: can now change framework after duplicating bib record

Changing the framework in the MARC editor immediately after duplicating
a bib record no longer clears the fields.

This patch changes the Changefwk Javascript function so that it passes
the "op" value and the "biblionumberdata" (as the biblionumber) from
addbiblio.pl back to itself, when submitting the form in order to
change the framework.

The reason we need to do this is because the form in addbiblio.tt
is hard-coded to always submit an "op" value of "addbiblio". Currently,
we need to have it hard-coded to "addbiblio", because all the magic
happens in addbiblio.pl when there is an "op" of "addbiblio". If we
always passed the "actual" "op" value, such as "duplicate", nothing
would ever happen when we clicked "save". It seems to me that this
is a flaw in the design of addbiblio.pl.

If we pass the "op" and "biblionumber" when changing frameworks, we're
able to tell addbiblio.pl that we're still wanting to "duplicate" this
"X" biblionumber. However, by having the form still hard-coded to
"addbiblio", when we hit save, the form will do the magic, check if
it's a duplicate, and save the record (or prompt for action if it
is a duplicate).

--

I also noticed that if you make changes to a record, then change
the framework before saving, your changes get cleared (since the
original record from the database is loaded when the page reloads).
It seems to me that this is a bug. Changing the framework should
change the layout while preserving the content. I think most users
would assume that when changing the framework.

This patch also introduces another hidden input into addbiblio.tt and
the Changefwk Javascript called "changed_framework". Basically, if
the Changefwk Javascript is run, it tells addbiblio.pl that the
framework is changed, and it uses the posted data from the form
(which we have been modifying) instead of reloading the record from
the database.

--

Test Plan:

A) Before Applying Patch:

To Show That Changing the Framework Erases All Fields When
Duplicating a Record:

1) Go to any bib record
2) Go to Edit > Edit as new (duplicate). You should see filled
in fields.
3) Change the framework to any other framework than the one
that is currently specified.
4) Note that every single field is now blank

To Show That Changing the Record then Changing the Framework
Ignores Changes, When Editing a Record

5) Go to any bib record
6) Go to Edit.
7) Change the title of the record to "I've changed the title".
8) Change the framework to any other framework than the one that is currently specified.
9) Look at the title. You'll notice it is the original title, and NOT "I've changed the title".

B) Apply the Patch

Also, clear your memcache and shift+refresh your screen. You don't want to use cached templates/javascript.

C) After Applying the Patch

Repeat Steps 1-3 and 5-8.

You should now notice that changing the framework when duplicating the item does not clear all the fields.

You should also notice that any changes you make prior to changing the framework will still exist after changing it.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit ca33b7fc635d93b3029831da7496372fb34c798f)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Works as expected.
(cherry picked from commit 98e397d9a5c5cbd3d2aa88cd0044c24a7d75ff72)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 98e397d9a5c5cbd3d2aa88cd0044c24a7d75ff72)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 502f35ea0a2405974d20a51ac2b42eb18fd1d4e2)

11 years agoBug 7143: Updating history and about page
Chris Cormack [Sun, 7 Jul 2013 08:38:55 +0000 (20:38 +1200)]
Bug 7143: Updating history and about page

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit d647090a4ab9b53577c1959dcdb0642a29fcbe6d)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 9886445eb8e82788167ec2440dfeddf0a6b3b58d)

Conflicts:

docs/history.txt

Solved minor conflicts

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 9886445eb8e82788167ec2440dfeddf0a6b3b58d)

Conflicts:
docs/history.txt

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit docs/history.txt)

11 years agoBug 10514: improve visibility of Add item link on new order form
Owen Leonard [Thu, 11 Jul 2013 14:28:55 +0000 (10:28 -0400)]
Bug 10514: improve visibility of Add item link on new order form

This patch converts the "Add" and "Clear" links
to the standard "submit/cancel" format inside a fieldset. This gives
them a little more visual weight.

Based on the changes made by Liz Rea and Jonathan Druart.

To test:

- create a basket
- add a record to it
- scroll down - the link to add item and cancel should both be more
  prominent now.
- Click "Add item" - it should add an item.

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
I still feel weird about the button, but as two people have said they'd rather have the button, I'm alright with it I guess.
Really what I want is people to notice it's there and click it at the appropriate time. I hope this will help that issue.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Leaves the translation problems, but that needs more work and is
out of the scope of this bug.
Tested Add and Update functionality works correctly.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 275f405c8b3920634907e5e1f2ef8ccecf497868)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 606a25bc41047291e4b11390b97caf5d9f01ae65)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 606a25bc41047291e4b11390b97caf5d9f01ae65)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit f3611a8030983e70a154e7b60ba418bae65f0af1)

11 years agoBug 10411: add cache control headers for static resources (Debian package)
Robin Sheat [Wed, 5 Jun 2013 05:50:29 +0000 (17:50 +1200)]
Bug 10411: add cache control headers for static resources (Debian package)

This adds caching directives to the static resources so that the browser
doesn't ask about them all the time.

By default, Debian apache doesn't have the required module (mod_expires)
enabled, and so this patch will have no effect. In order to enable this
function, run:

a2enmod expires

and restart apache.

Test Plan:
* Using firebug or equivalent, load a page.
* Note that none of the images, css, or js files have a Cache-Control or
  Expires header set.
* Add this patch, redeploy the package with it (or overwrite the
  apache-share.conf file) enable the 'expires' module, restart apache.
* Force-reload the page
* Note that the images, css, js now have Cache-Control and Expires set
  for 12 hours into the future.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit be905428722522f1ace4e99d13ffcb5d11f65657)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 6b94a9a3406f7c1b58a88b54c598ad617b84ee52)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 6b94a9a3406f7c1b58a88b54c598ad617b84ee52)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 5b93649f79e6011e316055bb48c367f829c3966f)

11 years agoBug 10490: Overdue fines cap can't store decimal values
Katrin Fischer [Mon, 1 Jul 2013 19:58:57 +0000 (21:58 +0200)]
Bug 10490: Overdue fines cap can't store decimal values

When overduefinescap was added to the issuingrules the datatype
given was decimal. This translates in MySQL to decimal(10,0).
This doesn't allow you to store decimal values and therefore
values like 4.5 are saved as 5 in the database.

To test:

On a current installation:
1) Try to enter 4.5 as Overdue fines cap. Verify that the value
   is not correctly saved.
2) Apply patch and run database update.
3) Try adding/changing an issuing rule setting Overdue fines cap
   to 4.5 again.
4) Verify the value is saved correctly.

Create a new Koha installation from scratch:
1) Verify that the issuingrules table has been created correctly
   and that you can add/mofidy issuingrules correctly.

Because this bug can create data loss, the old database update
has also been changed to avoid this problem for people updating
at a later point in time. Checkout an older version of Koha
pre 3.09.00.027.

1) Run the database updates.
2) Verify again, that adding/modifying issuingrules works correctly.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 16c57940441aac62c1c90538f3c7b7cd386e6d92)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 47df7c9641321b70cd132790d4cfeab500bc34be)

Conflicts:

installer/data/mysql/updatedatabase.pl

Solved

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 47df7c9641321b70cd132790d4cfeab500bc34be)

Conflicts:
installer/data/mysql/kohastructure.sql
installer/data/mysql/updatedatabase.pl

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 2727ca9512ad9e06fbba9a3c299dbdd78289da7c)

11 years agoBug 10560: add regression test
Galen Charlton [Fri, 12 Jul 2013 14:57:11 +0000 (14:57 +0000)]
Bug 10560: add regression test

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit e2bb7af21666ca61f65fb3163d8449823f5cab4b)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit a8ed0e52c65f3fed53108fc1cbe9b860e63f98b5)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit a8ed0e52c65f3fed53108fc1cbe9b860e63f98b5)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 4cae5281851983d59fb6a463aebc868398e6f2ba)

11 years agoBug 10560: make it possible for default interface language to not be English
Robin Sheat [Fri, 30 Nov 2012 02:48:50 +0000 (15:48 +1300)]
Bug 10560: make it possible for default interface language to not be English

If you enable another translation, and disable English, then if you dont
have a cookie set, or your browser is not set to that language, you will
get English. So you can not disable English in either the staff client
or the OPAC.

This patch fixes the language selection to do the right thing.

To test you must have at least one other language installed besides
English. Apply the patch and disable the en translation. Koha should
fall back to one of the enabled translations.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I added a patch description and test plan, missing from the
original patch.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I have tested with various combinations of activated languages
and have found no regression. If the cookie is set, the right
language is shown accordingly. Else the first language in the
list seems to be picked. It did never fall back to English
in my tests, when English was explicitly deactivated.

Passes all tests and QA script.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 38f596d48e19c8f7890caea7a6eb59b6174cf5fa)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Works as advertised.
(cherry picked from commit 8f0ce3c1a0e43e6fb8b7bae56e4d658bfc315631)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 8f0ce3c1a0e43e6fb8b7bae56e4d658bfc315631)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit e510a73acf53f76f73168466ee80f5f98d2c8e82)

11 years agoBug 10535: by default sort funds by name
Fridolyn SOMERS [Wed, 3 Jul 2013 12:24:23 +0000 (14:24 +0200)]
Bug 10535: by default sort funds by name

In parcels.pl, and other acquisition pages, the funds are not sorted
by name in combo-box.  With a great number of funds, it is difficult
to find one.

This patch adds a default value to $orderby arg of C4::Budgets::GetBudgets.

Test plan :
- Create a new fund with a name beginning with 'z' and set you as owner.
- Create a new fund with a name beginning with 'a' and set you as owner.
- Go to a vendor and click "Receive shipments"
- Look at fund combobox
=> Funds are sorted by name

Signed-off-by: Silvia Simonetti <s.simonetti@cineca.it>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
When testing make sure your funds would sort the other way
around when sorting by code instead of description.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit aa6cdb60a9ab2581ffef08796a349242d3d2ff66)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit f56768adba9fb1d39861e04796fac2be8cfdf914)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit f56768adba9fb1d39861e04796fac2be8cfdf914)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 58f7b60bf3d718a9d76e87632086adbc734a1117)

11 years agoBug 9519: fix code for Italian language search limiter
Sonia LEMAIRE [Wed, 3 Jul 2013 13:53:49 +0000 (15:53 +0200)]
Bug 9519: fix code for Italian language search limiter

'ind' rather than 'ita' was set as the ISO639-2 language
code for Italian in the fr-FR, it-IT, pl-PL, ru-RU, and uk-UA
installation SQL.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I checked nb-NO and de-DE - language code there had already
been corrected.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 707733ed2992a5d612d22510174301d65d3d7c05)

Conflicts:

installer/data/mysql/updatedatabase.pl

Trivial merge conflict in the usual suspect, updatedatabase.pl

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 645e80d58783aed46f368e36156ea69e2a34779e)

Conflicts:

installer/data/mysql/updatedatabase.pl

Solved merge conflict

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 645e80d58783aed46f368e36156ea69e2a34779e)

Conflicts:
installer/data/mysql/updatedatabase.pl

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 1140e9c46af8522373ec51fc6282bfc7c4936540)

11 years agoBug 10384: fall back to normal authentication if LDAP server is not available
Fridolyn SOMERS [Fri, 31 May 2013 08:17:08 +0000 (10:17 +0200)]
Bug 10384: fall back to normal authentication if LDAP server is not available

This fixes a bug where, assuming LDAP authentication is enabled, if a user
tries to log in while the LDAP server is down, the following fatal error
is displayed:

Can't call method "bind" on an undefined value at C4/Auth_with_ldap.pm line 134, <DATA> line 558.

This patch catches this error to allow normal authentication when LDAP connexion fails.

Test plan :
- Configure LDAP connexion with a host not having LDAP. ie :
 <useldapserver>1</useldapserver>
 <ldapserver id="ldapserver">
    <hostname>localhost</hostname>
    <base>dc=test,dc=com</base>
    <user>cn=Manager,dc=test,dc=com</user>
    <pass>passwd</pass>
    <replicate>0</replicate>
    <update>0</update>
    <auth_by_bind>0</auth_by_bind>
    <mapping>
      <firstname    is="givenname"      ></firstname>
      <surname      is="sn"             ></surname>
      <branchcode   is="branch"         >MAIN</branchcode>
      <userid       is="uid"            ></userid>
      <password     is="userpassword"   ></password>
      <email        is="mail"           ></email>
      <categorycode is="employeetype"   >PT</categorycode>
    </mapping>
 </ldapserver>
- Try to connect with mysql user (defined in koha-conf.xml)
- Try to connect with a user defined in borrowers
You may try to connect with working LDAP connexion

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 96ac578960cb4f2c5a964b3ac7fa4f9ba676b95d)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 85130dafc515363eba8f44973291a7af893a8b52)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 85130dafc515363eba8f44973291a7af893a8b52)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit e29a98f8166df4cad0cb6ea12bd06a39e52a4d47)

11 years agoBug 10088: FIX adding an order from a staged file.
Jonathan Druart [Thu, 25 Apr 2013 07:47:53 +0000 (09:47 +0200)]
Bug 10088: FIX adding an order from a staged file.

Bug 9902 introduced an issue in the C4::Items::PrepareItemrecordDisplay
routine. The existence of $defaulvalue hashref should be tested before
getting to the branchcode key.

Test plan:
Before applying the patch, an error occurred when you try to create an
order from a staged file.
After applying the patch, the error does not appear anymore.

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit f2e44716f60578b9663862d7b2ba3b16f7067143)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit a8ee942442d42e7ae4f42567eba22f33725188a5)

Conflicts:
C4/Items.pm
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 424a73e889edf5d8e90150ed504fa802953d8194)

11 years agoBug 9533: batch item modification form now shows default field values only by request
Kyle M Hall [Wed, 17 Apr 2013 13:33:55 +0000 (09:33 -0400)]
Bug 9533: batch item modification form now shows default field values only by request

This patch makes the pre-population of the fields for the batch
item editor with the default values from the default framework
optional and off by default.

Test Plan:
1) Apply patch
2) Add default values for cost and replacement cost to the
   default framework.
3) Browse to Tools / Batch item modification
4) Choose a file, or entire some barcodes in the text area
5) Ensure that the 'Populate fields with default values from default
   framework' is *not* checked
6) Click 'Continue'
7) Observe that the fields for cost and replacement cost are blank
8) Click the 'back' button on your browser
9) Check the checkbox to enable the default value
10) Click 'Continue'
11) Observe that the fields for cost and replacement cost now contain
    the default values you assigned them in the default MARC framework

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Switch works correctly, all tests and QA script pass.

Note: there is a bug with default values for all non text input
fields. Default values won't be applied for those fields as the
pull downs are not preselected correctly with the default values
defined in the framework.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 2d32ab38148f7d75412a36e928dea799717bc5fb)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 3865b14a57c4e0d4547980acf67060eac181161f)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 3865b14a57c4e0d4547980acf67060eac181161f)

Conflicts:
tools/batchMod.pl
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 2db1c2b208c53a59bd896af426455122b7b738e5)

11 years agoBug 9113: fix handling of certain characters by item batch modification tool
Fridolyn SOMERS [Wed, 26 Jun 2013 15:52:40 +0000 (17:52 +0200)]
Bug 9113: fix handling of certain characters by item batch modification tool

If you're using the batch modification tool and entering a call number
like "E+ 123 ABC", the tool removes the + and puts a space in its place,
e.g., "E  123 ABC"

This is because the form is posted via Ajax by background-job-progressbar.js.
Values are URI-encoded using escape(), but this method does not escape some
characters: * @ - _ + . /

Also, "+" is considered as a space in a URI.

This patch replaces escape() by encodeURIComponent() which encodes every character.

Test plan :
Perform an items batch modification by setting '* @ - _ + . /' in a field
(notes for example) and see that all characters are saved correctly.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 0397e7ea64c208c140d7178ed34c3bd4b266fcfb)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit dbd52acf2958bca6b126a35a47d03b6d4d4d541d)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit dbd52acf2958bca6b126a35a47d03b6d4d4d541d)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 70cc750a5f96ca72c07f359006730ff92f9ff5b5)

11 years agoBug 5894: Display all titles when confirming copy of items from cart to list
Marc Veron [Fri, 14 Jun 2013 14:37:23 +0000 (16:37 +0200)]
Bug 5894: Display all titles when confirming copy of items from cart to list

Adds missing code that splits biblios before calling template.

To test:
- Add some items to cart
- Open cart, select some or all items
- Add to list; with patch, following window shold show something
  like "Add 3 items to a list:", followed by list of items

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passes koha-qa.pl, works as advertised.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit bed99a851646fd0c7a4c906dd9dfe60c485b40c6)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 7c92496cf7f7ee1016b934a8e01e995b680f9761)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 7c92496cf7f7ee1016b934a8e01e995b680f9761)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit e94b493fc7f6217a92d91f78ce6849d73fd8c6e8)

11 years agoBug 10428: undefined check in add additem.pl
Fridolyn SOMERS [Fri, 7 Jun 2013 08:17:54 +0000 (10:17 +0200)]
Bug 10428: undefined check in add additem.pl

In additem.pl, in the code that generates item form you find:

@values = $itemrecord->field($tag)->subfield($subtag) if ($itemrecord && defined($itemrecord->field($tag)->subfield($subtag)));

This patch adds the check of $itemrecord->field($tag) undef.
I did not found a way to test it because item tag is always defined
when editing an item, but it would be safer/prettier to add this check.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit e31b158245f4eff36decebf30c8a87c8cfebe472)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 54d414ee2d16a2969c91e5a83cb8c66858fed03c)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 54d414ee2d16a2969c91e5a83cb8c66858fed03c)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 3390a6efc74714f6ebd577d06f344acbff001357)

11 years agoBug 10029 - CAS authentication fails in OPAC reserve
Fridolyn SOMERS [Thu, 11 Apr 2013 14:46:23 +0000 (16:46 +0200)]
Bug 10029 - CAS authentication fails in OPAC reserve

If OPAC reserve page is accessed without being logged-in, login form is displayed as well as a CAS authentication link (if enabled). A click on this link will lead to CAS server but one comming back to Koha, page shows an error : "ERROR: No biblionumber received".
This is because CAS link only contains the query path "/cgi-bin/koha/opac-reserve.pl", not the query parameters.

This patch adds query parameters to URI sent to CAS.

Test plan :
- Enable CAS
- Go to opac without been logged-in
- Try to place hold on a record
=> You get to /cgi-bin/koha/opac-reserve.pl?biblionumber=XXX showing authentication page
=> Check that CAS link contains query param "biblionumber"
- Click on CAS link and log in
=> Check you return well logged-in to reserve page with biblionumber param

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I have followed the test plan as far as I could and the links
contain the biblionumber now, which they didn't before.
I couldn't check the CAS login, but my normal login worked
as expected.
All tests and the QA script pass.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 974ab561ef00e76e7329f61b016b5d6b3103dde7)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 2dff5177f2d7c542175b28adf1832e201c0ae864)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 2dff5177f2d7c542175b28adf1832e201c0ae864)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit bd199ff98c8c34bd6587f12bc3a844827ed07aa9)

11 years agoBug 10497 - star ratings not showing right in ccsr detail
Owen Leonard [Fri, 28 Jun 2013 18:21:03 +0000 (14:21 -0400)]
Bug 10497 - star ratings not showing right in ccsr detail

Star ratings do not appear correctly in the CCSR theme because it lacks
the image sprite used to display them. This patch adds the required
file.

To test, apply the patch and view a search results set which includes
titles which have an existing rating. Ratings should appear correctly.

View a detail page for an title which has a rating, and add a rating to
a title which has no rating. Ratings should look correct and work
correctly.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All tests pass - including leaving a rating on the newly visible stars

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
In order to test this, make sure you have set OpacStarRatings set
to 'results and details'.

The star images show up in OPAC results with the correct amount
of stars after applying the patch.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 2fccb14a806e9aad18cc9f75df39e09bd64830dd)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 2898cf57e5c3b9c6fd8f4fe8f0d5c180ab28fc06)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 2898cf57e5c3b9c6fd8f4fe8f0d5c180ab28fc06)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 452d6eed5880eb40bbee79c9f0938fbbd1fb3d26)

11 years agoBug 10484: serials-edit.pl not checking for barcode field before checking for barcode...
Kyle M Hall [Mon, 17 Jun 2013 16:28:13 +0000 (12:28 -0400)]
Bug 10484: serials-edit.pl not checking for barcode field before checking for barcode subfield

The script serials-edit.pl is not checking for the existence of the
barcode field before checking for barcode subfield for autoBarcode =
incremental. If the barcode field doesn't exist, the script dies with
errors.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes tests and QA script.
Checked that adding items on serial receive still works.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 9af08e4e2d2091de489633b3f1c4fb03fcf323cd)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 1d9ac2b10a96800d301524978f00ee393b5bb75e)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 1d9ac2b10a96800d301524978f00ee393b5bb75e)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit d9c39688bcc5f4064763d8e2a6958c94066dbdd8)

11 years agoBug 10386: improvements to VirtualShelves.t
Marcel de Rooy [Mon, 3 Jun 2013 13:27:50 +0000 (15:27 +0200)]
Bug 10386: improvements to VirtualShelves.t

Most important: Does no longer delete all shelves!
Checks if there are ten borrowers for testing. But even works without them :)
When creating or modifying lists, takes name clashes into consideration.

Small change to _CheckShelfName in VirtualShelves module. Making it possible to
check a name for a list whose owner has been set to NULL. Note that a test
like field=? with undef for placeholder will not work in MySql.

Test plan:
How do you test a test? Well, you could run it on various databases..
But for real hacking, you could also add some debug lines.
I tested this by forcing 10 undefs in @borrowernumbers.
And by overwriting the return value of randomname with an existing name.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 93e87ca0b61611fc35238bf13eb226f477cf9c4e)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit a97b62379f82a94157916959109c7c1a75582d8a)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit a97b62379f82a94157916959109c7c1a75582d8a)

Fixed minor conflicts:
C4/VirtualShelves.pm
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 5e9db705a5466ff508d45a9bbfcabd9744efa53f)

11 years agoBug 10290: Followup for Virtualshelves.t
Marcel de Rooy [Mon, 3 Jun 2013 12:25:43 +0000 (14:25 +0200)]
Bug 10290: Followup for Virtualshelves.t

Put the 10 biblionumbers in a list
Add a FIXME for deleting shelves
Do temporary repair on duplicate name test (Followup via report 10386)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 1ef99ace2043d75889830c4c0af8af3e9e36104e)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit e26655fe03c2f5181d6a820f40e38a7cebb46e05)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Missed this one from previous release
(cherry picked from commit e26655fe03c2f5181d6a820f40e38a7cebb46e05)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 2b2457329467e5a30a748903eb60390f1cafd51d)

11 years agoBug 10290: UT: VirtualShelves.t needs to create its own data
Jonathan Druart [Mon, 20 May 2013 14:56:38 +0000 (16:56 +0200)]
Bug 10290: UT: VirtualShelves.t needs to create its own data

Try before the patch:
prove t/db_dependent/VirtualShelves.t

And after, it should produce:
  t/db_dependent/VirtualShelves.t .. ok
  All tests successful.
  Files=1, Tests=82,  6 wallclock secs ( 0.03 usr  0.00 sys +  0.46 cusr  0.03 csys =  0.52 CPU)
  Result: PASS

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 44905ac99cee8ddca6c63752d948a74afae20194)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Tests are good :-D. They look fine and work as expected.
(cherry picked from commit e918450e6ad6e661474479f8890f6b141fe4e15a)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Missed this one from previous release
(cherry picked from commit e918450e6ad6e661474479f8890f6b141fe4e15a)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit a16542961f60f5a77d0af86d605a890a5b23782d)

11 years agobump up version numbers for 3.8.16 release v3.08.16
Galen Charlton [Mon, 29 Jul 2013 17:23:38 +0000 (17:23 +0000)]
bump up version numbers for 3.8.16 release

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agorelease notes for 3.8.16
Galen Charlton [Mon, 29 Jul 2013 17:23:17 +0000 (17:23 +0000)]
release notes for 3.8.16

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agomove Auth_ParseSearchHistoryCookie.t to db_dependent directory
Galen Charlton [Sun, 28 Jul 2013 19:42:51 +0000 (19:42 +0000)]
move Auth_ParseSearchHistoryCookie.t to db_dependent directory

The actual tests in this script are not dependent on the database,
but simply loading C4::Auth requires a valid(ish) koha-conf.xml
and database.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agodo some validation of the KohaOpacRecentSearches cookie
Galen Charlton [Sun, 28 Jul 2013 02:48:44 +0000 (02:48 +0000)]
do some validation of the KohaOpacRecentSearches cookie

Add validation of the value of the KohaOpacRecentSearches.  In
particular, this patch avoids the generation of an internal server
error when the OPAC is presented with an old cookie that uses the
old Storable-based serialization.

This patch also moves parsing of the cookie value into a
new routine in C4::Auth, ParseSearchHistoryCookie, and adds
a test case.

To test (in conjunction with the previous patch):

Exercise the OPAC search history functionality, after
turning on the EnableOpacSearchHistory syspref:

- As an anonymous user, conduct a variety of searches,
  including ones that include non-ASCII characters
- Check the search history and verify that all searches
  are listed
- Apply this patch and the previous one.
- Do *not* clear the KohaOpacRecentSearches cookie
- Check the search history and verify that no searches
  are listed any more
- As an anonymous user, conduct a variety of searches,
  including ones that include non-ASCII characters
- Check the search history and verify that all searches
  are listed
- Log into the OPAC
- Verify that current and past searches are listed in
  search history.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agouse JSON rather than Storable for the OPAC search history cookie
Galen Charlton [Thu, 25 Jul 2013 16:50:30 +0000 (16:50 +0000)]
use JSON rather than Storable for the OPAC search history cookie

To test:

Exercise the OPAC search history functionality, after
turning on the EnableOpacSearchHistory syspref:

- Clear the KohaOpacRecentSearches cookie
- As an anonymous user, conduct a variety of searches,
  including ones that include non-ASCII characters
- Check the search history and verified that all searches
  are listed
- Log into the OPAC
- Verify that current and past searches are listed in
  search history.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agokoha 3.8.15 release v3.08.15
Chris Hall [Tue, 23 Jul 2013 08:14:28 +0000 (20:14 +1200)]
koha 3.8.15 release

11 years agoRelease notes for 3.8.15
Chris Hall [Tue, 23 Jul 2013 07:54:06 +0000 (19:54 +1200)]
Release notes for 3.8.15

11 years agoTranslation updates for 3.8.15
Bernardo Gonzalez Kriegel [Mon, 22 Jul 2013 22:17:43 +0000 (19:17 -0300)]
Translation updates for 3.8.15

11 years agoBug 10379 - Followup: add koha-rebuild-zebra -q to the man page
Magnus Enger [Tue, 25 Jun 2013 06:39:23 +0000 (08:39 +0200)]
Bug 10379 - Followup: add koha-rebuild-zebra -q to the man page

The first patch on this bug forgot to add the new -q option to
koha-rebuild-zebra to the man page for that command. This patch
fixes it.

To test, run something like these commands:

$ xsltproc /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl \
  debian/docs/koha-rebuild-zebra.xml
$ man -l koha-rebuild-zebra.8
This should display the man page. (Remember to remove koha-rebuild-zebra.8
when you are done :-)

$ prove xt/verify-debian-docbook.t
All tests should pass.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 114ad0015b209404b30289397646cb2f21d4aa54)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 6643a41c97b3a9b4129f0dd7d1fa854f2f93fb14)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 6643a41c97b3a9b4129f0dd7d1fa854f2f93fb14)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit e5bfa466362579fb24009c22ee756f3b9b731140)

11 years agoBug 10379: silence zebra rebuild cron when no instances are enabled
Robin Sheat [Thu, 30 May 2013 04:12:13 +0000 (16:12 +1200)]
Bug 10379: silence zebra rebuild cron when no instances are enabled

This adds a -q option to koha-rebuild-zebra that prevents it outputting
help if no instances are provided on the command line. This means that
if you've just installed the package, you won't get messages from cron
telling you how to use the script.

Test plan:
* install koha-common 3.12 or master onto a system with no enabled
  instances.
* note that you or the sysadmin will start getting emails every 5
  minutes.
* replace /etc/cron.d/koha-common and /usr/sbin/koha-rebuild-zebra with
  the versions from this patch.
* note that the emails stop flowing.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
"sudo koha-rebuild-zebra -q" gives no output, as expected.
Followed the test plan, all looks good.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit c31e553a72d40bf0b1c099284ecbb4b95833e186)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit cc9b3522b192b8510a4846cd7a4b3aca3e8a0a07)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit cc9b3522b192b8510a4846cd7a4b3aca3e8a0a07)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry oicked from commit 22341e5fe36e54523464b633de6a500bc706e248)

11 years agoBug 9541: make OPAC login page respect OPAC_CSS_OVERRIDE
Kyle M Hall [Tue, 19 Feb 2013 16:41:59 +0000 (11:41 -0500)]
Bug 9541: make OPAC login page respect OPAC_CSS_OVERRIDE

When clicking the login link for opac-user.pl in a multiple branch
scenario the environment variable for OPAC_CSS_OVERRIDE was ignored from
the koha-conf.xml file.  It seems like is is working on every page in
the opac except for the login page.

Test Plan:
1) Set up a Koha server with 2 separate catalog configurations
   ( e.g. opac1.kohatest, opac2.kohatest )
2) Set the OPAC_CSS_OVERRIDE directive for separate css files
   in each opac
3) Browse to the opac login page, note the css is not applied
4) Apply this patch
5) Reload the page, note the css is now applied

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 71b79d59908cd85130afd8600eff0f93fc79b8a9)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 69a8048eeecacff99b64fa722fa8850891476031)

Solved Conflicts in C4/Auth.pm

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 69a8048eeecacff99b64fa722fa8850891476031)

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit b9687ad6a6f638bc25fb2cad12fa5da73c10e714)

11 years agoBug 10439: fix bug preventing the library for a notice from being changed
Jonathan Druart [Mon, 10 Jun 2013 12:05:32 +0000 (14:05 +0200)]
Bug 10439: fix bug preventing the library for a notice from being changed

2 javascript functions should be apply only in a specific case, not for all
views.

Test plan:

- Switch on the IndependentBranches pref and log
  in as a superlibrarian.
- Try to change the library for a notice. Before the patch,
  no change is applied.
- Try to create a new notice, changing the library from
  default in the process.  Before the patch, the notice
  is not created.

The bug can also be reproduced when IndependentBranches is
off, in which case the staff user need not be a superlibrarian.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 77a5e3e365a50b02c9f224d731e05de90fc667c9)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Test plan works as advertised.
(cherry picked from commit a2e89edf43b2946da0986a5c83b04a60dea04061)

Solved Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit a2e89edf43b2946da0986a5c83b04a60dea04061)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit d2a284da136cdf72cb201d0efd049507f66393e7)

11 years agoBug 10464: Patron search on placing a hold now supports autocomplete
Tomas Cohen Arazi [Thu, 13 Jun 2013 17:20:43 +0000 (14:20 -0300)]
Bug 10464: Patron search on placing a hold now supports autocomplete

The patron search box for placing a hold request on a bib in the
staff interface now supports autocomplete if the CircAutocompl
system preference is enabled.

This patch grabs the autocomplete handling javascript stuff from patron-search-box.inc
and puts an adjusted version on reserve/request.tt.  It sets form and input
IDs to match those configured in the autocomplete call, adjusted where needed to
avoid name collisions with the patron-search-box.inc that is present everywhere.

This patch also doubles the width of the patron search input field.

To test:
- On a biblio record, go to the Holds tab, mine looks like
  /cgi-bin/koha/reserve/request.pl?biblionumber=2
- A search box is shown for patron searching.
- Search for a patron: it works as usual.
- Make sure CircAutocompl is "Don't try"
- Apply the patch
- Click the Holds tab again, and do the same search: functionality should remain intact.
- Change CircAutocompl to "Try"
- Click the Holds tab again
- Autocomplete should show you the possible options, and once you choose one result,
  it should work as usual.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Adding a nice new autocomplete feature.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit dc94a9bef79dc6d186fe93d82dac10cab0468d24)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit ab3163564e91921222c153897f786551fe59647e)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit ab3163564e91921222c153897f786551fe59647e)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit dd574b1b705b545eba115371d37ac4545ad0bdf3)

11 years agoBug 766: remove CGI::scrolling_list from request.pl
Colin Campbell [Thu, 30 May 2013 17:23:55 +0000 (18:23 +0100)]
Bug 766: remove CGI::scrolling_list from request.pl

Let the template take care of generating the display.
Lets at least part of request.pl be more succinct.

To test, place a hold and search for the patron using a partial name.
You should get a dropdown select list of patrons and be able to select
the patron to hold for from there.

The functionality should remain unimpaired after this patch is applied.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 7668e19c9593da570cffb5cd4640fe175d739328)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit b88f16a4e99d533753e3d707239e94da019ce303)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit b88f16a4e99d533753e3d707239e94da019ce303)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit ccbc3226646c3c3b68b2ecffc84689a0f66a7ace)

11 years agoBug 10466: fix glitch in OPAC display of titles saved to list
David Cook [Fri, 14 Jun 2013 03:03:19 +0000 (13:03 +1000)]
Bug 10466: fix glitch in OPAC display of titles saved to list

When displaying (in the OPAC) the set of records saved to a list,
an apparently random number (typically 33 or 34) is sometimes
displayed at the end of the publication description.  In particular,
this can occur when XSLT is *not* being used to display search results;
this patch corrects the problem.

Now for the technical details:

This patch checks to see if "size" is undefined. If it is, we add a
blank (i.e. "") value to it in place of undef.

If we do not do this, calling "itemloo.size" will return the size
of the "itemloo" hash, rather than the value for the "size" key.

This is because "size" is a virtual method in Template Toolkit. It's
uncertain why the value is retrieved for the "size" key when there is
a defined value and why TT doesn't use the method instead, and that
it uses "size" as a method only if there is either no "size" key or
if the value tied to the "size" key is null/undef. This might be a
feature or it might be a bug in TT...

In the meantime, we will check to see if it's undefined. If it is,
we'll give it a value.

This bug has been identified in the opac-search.pl, search.pl and
addbooks.pl pages before. To address it, we're currently checking
if there is a "size" key, and if not...we're adding one with a blank
value.

This patch takes up that same idea, although I think it might be better
to rename the variable before passing it to TT in case the behaviour
of TT changes in the future in regards to how it handles virtual
methods.

N.B. Obviously, this only affects users not using XSLTs.

--

Test Plan:

Before applying the patch:

0) Make sure you have opac search result XSLT turned off

1) Find bib records that do not have a 300$c (Dimensions) value.
2) Find bib records that do have a 300$c (Dimensions) value.

(N.B. These values should be stored in the `size` column of biblioitems).

3) Add items from both sets of records to a List
4) Note that records without a 300$c will display a number at the end
of the "Publication" description/string. It should be something like
33 or 34 in most cases.
5) Note that records with a 300$c don't display this number. They just
show the value from 300$c.

Apply the patch.

6) Clear your cache, refresh the page, etc.
7) Note that the number (e.g. 33 or 34) has disappeared from the end
of the "Publication" description/string.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Added a small comment at the end of this one line.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit ceada35e008e6a60b62f384ec386e80b03fe0130)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit a7d116e2fe39a17dd076e1dc805239622b410418)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit a7d116e2fe39a17dd076e1dc805239622b410418)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 0cb17b47f67f1d91221841e70f8430bdca5642a8)

11 years agoBug 10590 - parameterise the limit option
Robin Sheat [Mon, 15 Jul 2013 14:06:40 +0000 (02:06 +1200)]
Bug 10590 - parameterise the limit option

The limit option was previously substituted directly into the query. The
previous patch on bug 10590 filters it on input, but there's no reason
not to have it made to work properly in the query for added safety.

To test:

[1] Go to the top checkouts report (http://OPAC/cgi-bin/koha/opac-topissues.pl)
[2] Run the report several times, varying the filters on
    number of results and item type.
[3] Verify the the list of top checkouts appears to be correct.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 89cf013a6fadcb1347151798f3fdab0d8c75cd15)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 2e77edf8dfa0350a6e20805e7fa39b97608c804e)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 2e77edf8dfa0350a6e20805e7fa39b97608c804e)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit f5ee81028dda33027daf3c921b38bf06218f9dfa)

11 years agoBug 10590 - in opac-topissues limit param is not protected
Fridolyn SOMERS [Mon, 15 Jul 2013 11:00:18 +0000 (13:00 +0200)]
Bug 10590 - in opac-topissues limit param is not protected

In opac-topissues page, the limit URL argument is directly added to SQL query.

This patch adds protections : limit must only contain digits and must be lower than 100.

Test plan :
- Edit URL to : /cgi-bin/koha/opac-topissues.pl?limit=10&branch=&itemtype=&timeLimit=999&do_it=1
=> You get the results of 10 most cheched-out of all time
- Edit URL to : /cgi-bin/koha/opac-topissues.pl?limit=&branch=&itemtype=&timeLimit=999&do_it=1
=> You get the results of 10 most cheched-out of all time
- Edit URL to : /cgi-bin/koha/opac-topissues.pl?limit=9999&branch=&itemtype=&timeLimit=999&do_it=1
=> You get the results of 100 most cheched-out of all time
- Edit URL to : /cgi-bin/koha/opac-topissues.pl?limit=WHERE&branch=&itemtype=&timeLimit=999&do_it=1
=> You get the results of 10 most cheched-out of all time

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 57866d6b67c3f8b29290150f21c71395315a73fe)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 5867909f8866b4e68340b88817bfb95f51bc3c9e)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 5867909f8866b4e68340b88817bfb95f51bc3c9e)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit c0cb1f8b0e8aa53707447ee7c27fd15fc0a7b80c)

11 years agoBug 10425: tweaks to text of help for local use system preference
Galen Charlton [Fri, 14 Jun 2013 15:30:35 +0000 (08:30 -0700)]
Bug 10425: tweaks to text of help for local use system preference

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit c02b57bd5cacc3fbe981f5d8331c7cfe8aa178a7)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 1133c328b31cf9e8138de85ef266a6557757bab4)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 1133c328b31cf9e8138de85ef266a6557757bab4)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 4339d827792c7063066e873b2280b39d70e8f590)

11 years agoBug 10425 - Help page missing for Local Use preferences
Fridolyn SOMERS [Thu, 6 Jun 2013 08:57:29 +0000 (10:57 +0200)]
Bug 10425 - Help page missing for Local Use preferences

When viewing Local Use system preferences tab, the help button will lead to an error page.
This is because Local Use tab uses not the same script has other tabs : systempreferences.pl.

This patch adds help/systemprefences.tt

Test plan :
- Go to Local Use preferences : /cgi-bin/koha/admin/systempreferences.pl
- Click on Help link (at right top)
- See you get the same page as other preferences tab help

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 0e0a1a61a62473de7ae92bde9d0f3617c34ba325)
(cherry picked from commit ff9638d8151258eec1ee1bb67196845eb1dabd18)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit ff9638d8151258eec1ee1bb67196845eb1dabd18)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit ccc0691f7f1fd4dfc8e98c30ffc5117508aaed43)

11 years agoBug 10458: t/Z3950.t should be removed too
Jonathan Druart [Fri, 14 Jun 2013 12:48:46 +0000 (14:48 +0200)]
Bug 10458: t/Z3950.t should be removed too

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit cab50698f57c88670241d88028afebd3eb5b5dd8)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit d5f9a3ec5c6f86c9678e6df39bbd2ac69fc77c95)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit d5f9a3ec5c6f86c9678e6df39bbd2ac69fc77c95)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit bc51544b4642496271f211121f8f8cebf6d16155)

11 years agoBug 10458: Remove obsolete Z3950 module and test
Marcel de Rooy [Thu, 13 Jun 2013 08:20:27 +0000 (10:20 +0200)]
Bug 10458: Remove obsolete Z3950 module and test

Are not used. Contain several FIXMEs.
Removing them makes life easier.

Test plan:
Actually, you cannot test this.
But for confidence: do a Z3950 search in cataloguing and acquisition.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 63ba05183e627bbe7278b9064d22e93d39b65461)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 1dbd1d938aabb72021cd8157e111d3f7555fff9d)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 1dbd1d938aabb72021cd8157e111d3f7555fff9d)

Conflicts:
C4/Z3950.pm

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit b98c4419150ceeee367f8ef1a07953494c8d7455)

11 years agoBug 10297 - categorycode and branchcode should be required when adding patrons
Owen Leonard [Mon, 10 Jun 2013 15:14:41 +0000 (11:14 -0400)]
Bug 10297 - categorycode and branchcode should be required when adding patrons

categorycode and branchcode should show as required under all
circumstances, not just when they are included in the
BorrowerMandatoryField system preference. This patch adds the correct
classes and hints to those fields.

To test, view the patron entry form for a new or existing patron.
Category and Library should show that they are required.

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 81bfae93649a2f1a93f4722d052fc529c6495d71)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Logical addition
(cherry picked from commit 545504e6041809b2ec5d435f9a8660428ec60e52)

Solved Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 545504e6041809b2ec5d435f9a8660428ec60e52)

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 343423b2b6806f824838a4cdb343cecbf1960f4e)

11 years agobug 9370: improve splitting of LC call numbers for labels
Galen Charlton [Wed, 9 Jan 2013 01:32:47 +0000 (17:32 -0800)]
bug 9370: improve splitting of LC call numbers for labels

Use the Perl module Library::CallNumber::LC to parse and split
LC call numbers when generating spine labels.

For example, QH541.15.C6 C25 2012 should be split as follows:

QH
541.15
.C6
C25
2012

To test, create an item with call number QH541.15.C6 C25 2012
and classification source LC, then create a spine label for that
item using a layout of type 'biblio' that has the split call numbers
option enabled.  The call number should be split as indicated above.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit edb8bddff074769a95744b6a7fa59eff61e0cfc1)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 10f5822daabf34ede50b2b35b5e02324482af9ac)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 10f5822daabf34ede50b2b35b5e02324482af9ac)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 56ea58ecda26f6ca4e4e8e437296b2aa2a2419d0)

11 years agobug 9370: add invalid call number to LC splitting test cases
Galen Charlton [Wed, 9 Jan 2013 01:28:40 +0000 (17:28 -0800)]
bug 9370: add invalid call number to LC splitting test cases

'123 ABC FOO BAR' is intentionally *not* a valid LC call number,
but in order to preserve legacy behavior, it should be split on
whitespace.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit a5e9e15663289489e0baafff73d7bed20434b8ec)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit d743b2084cddb5197393bfa5ffeaf6f1e0334784)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit d743b2084cddb5197393bfa5ffeaf6f1e0334784)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 0e82fef70b2e4fd9124f9c7538a01030e10a455b)

11 years agobug 9370: test case for splitting LC call number
Galen Charlton [Wed, 9 Jan 2013 01:18:30 +0000 (17:18 -0800)]
bug 9370: test case for splitting LC call number

QH541.15.C6 C25 2012 should be split as follows:

QH
541.15
.C6
C25
2012

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit ecf6721060607b621c58f234ab5a5f43e30b1d98)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 8ceab821b5ded6fb14ac747dfc1e2c67a3cbbad8)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 8ceab821b5ded6fb14ac747dfc1e2c67a3cbbad8)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 8ff1fc43c0aa67a07e90f28eace963083829d0a7)

11 years agobug 6281: add Library::CallNumber::LC as a required Perl dependency
Galen Charlton [Fri, 17 Aug 2012 15:49:45 +0000 (11:49 -0400)]
bug 6281: add Library::CallNumber::LC as a required Perl dependency

This module is currently packaged by Debian for Wheezy and by
Ubuntu for Precise and Quantal.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit f1c45784dc5dfa431ef68e5d38a14b6fb93c904d)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit e4faf296c98f70f44ee67d2354a7cf5c682b27c8)

Solved minor Conflicts:
C4/Installer/PerlDependencies.pm

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit e4faf296c98f70f44ee67d2354a7cf5c682b27c8)

Solved minor conflict:
C4/Installer/PerlDependencies.pm

Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit c5f4ef1c49a8410fcf9aa44d46475ed5227f86ad)