]> git.koha-community.org Git - koha.git/log
koha.git
8 years agoBug 15517: Change number of tests for 3.22
Julian Maurice [Fri, 26 Feb 2016 14:16:49 +0000 (15:16 +0100)]
Bug 15517: Change number of tests for 3.22

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15517: Change wording for tests
Jonathan Druart [Mon, 11 Jan 2016 08:35:11 +0000 (08:35 +0000)]
Bug 15517: Change wording for tests

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 100d800060c26378b91b465926a5993cb5596300)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15517: deleted* tables won't never differ anymore!
Jonathan Druart [Thu, 7 Jan 2016 15:26:15 +0000 (15:26 +0000)]
Bug 15517: deleted* tables won't never differ anymore!

These tests will ensure that the 4 deleted* tables won't never differ
anymore.

Test plan:
0/ Do not execute the update DB entry
1/ prove t/db_dependent/db_structure.t
should fail
2/ Execute the update DB entry and update the schema with
misc/devel/update_dbix_class_files.pl
3/ prove t/db_dependent/db_structure.t
should now be happy

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Test pass successfuly. Works as advertised

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 8b2573e24e50d2911d88aa6d9ec969b51f37284b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15517: Resync borrowers and deletedborrowers tables
Jonathan Druart [Thu, 7 Jan 2016 15:24:05 +0000 (15:24 +0000)]
Bug 15517: Resync borrowers and deletedborrowers tables

The 2 columns password and userid are not sync and could cause errors
when deleting patrons.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit f4f307230ab0aeb3d28566dd0e5e9f7b851800b0)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 13534: Update DBIx::Class schema
Julian Maurice [Fri, 26 Feb 2016 13:38:31 +0000 (14:38 +0100)]
Bug 13534: Update DBIx::Class schema

8 years agoBug 15514: Fix error with certain repeatable fields in Rancor
Jesse Weaver [Wed, 27 Jan 2016 23:39:22 +0000 (16:39 -0700)]
Bug 15514: Fix error with certain repeatable fields in Rancor

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 53a081278d505b76efbd7c08dbe7d45649779740)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15479 [QA Followup] - Tidy sub to remove tabs causing qa script to fail
Kyle M Hall [Thu, 11 Feb 2016 04:29:55 +0000 (04:29 +0000)]
Bug 15479 [QA Followup] - Tidy sub to remove tabs causing qa script to fail

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit d268d428fd984aeb76f617e0e93ef6fdea543230)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15479 Add tests for ILS.pm
Colin Campbell [Thu, 21 Jan 2016 11:30:31 +0000 (11:30 +0000)]
Bug 15479 Add tests for ILS.pm

This patch specifically adds a test for the sub added to
resolve Bug 15479. As no test script existed to add this two
added one which also tests that ILS objects can be instantiated
correctly and offer the required interface

NOTE: This does not apply without the first patch.
      Comment #3 suggested a unit test that would fail
      before and pass after. So while this code is good,
      it missed the before case. -- mtompset

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit df4b1552211aae130b2ac31b44f45892c342e28c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15479 Make ILS cardnumber comparison case insensitive
Colin Campbell [Wed, 6 Jan 2016 12:56:24 +0000 (12:56 +0000)]
Bug 15479 Make ILS cardnumber comparison case insensitive

The borrowers table is defined COLLATE=utf8_unicode_ci which means
that cardnumbers may be saved in either lowercase or uppercase and
these are considered equivalent.
The server was performing a case sensitive comparison between
the incoming patron identifier and that retrieved from the db
As a result some renewals were rejected as being on loan to
another borrower if the stored cardnumber differed in case.

Make code comparison comply with db.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 203659ee60b25614eecd01f69e23e3be57952707)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15071: Update compiled opac.css
Julian Maurice [Fri, 26 Feb 2016 13:11:49 +0000 (14:11 +0100)]
Bug 15071: Update compiled opac.css

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15071 - In OPAC search results, "checked out" status should be more visible
Owen Leonard [Thu, 18 Feb 2016 02:17:10 +0000 (21:17 -0500)]
Bug 15071 - In OPAC search results, "checked out" status should be more visible

The prog template in the OPAC designated a color for the "unavailable"
class associated with items in search results which are checked out.
This class never made it into the Bootstrap theme. This patch adds it to
the Bootstrap theme's LESS file.

To test, apply the patch and search the OPAC for terms that will return
checked out items. In the list of search results, on the "availability"
line, the "Checked out" text should now be red. The change is visible
with XSLT on or off.

Signed-off-by: Nicole C Engard <nengard@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 4270c1443f1a66de2c9ba7f781176c8c3914c88b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 14930 [QA Followup] - Allow OpacFineNoRenewals to be 0
Kyle M Hall [Thu, 28 Jan 2016 23:09:43 +0000 (23:09 +0000)]
Bug 14930 [QA Followup] - Allow OpacFineNoRenewals to be 0

Works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 655e35649c1877224d184de2baf82e3a505ec999)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 14930 - Leaving OpacFineNoRenewals blank blocks renewals, but should disable...
Gus [Tue, 19 Jan 2016 03:12:48 +0000 (03:12 +0000)]
Bug 14930 - Leaving OpacFineNoRenewals blank blocks renewals, but should disable feature

To Test
- Borrower has some fines and checkouts
- Leave OPACFineNoRenewals empty/blank
- Try to renew items in the OPAC
- notice error message
- Add a big value to OpacFineNoRenewals
- notice renewals work

Leaving the OPACFineNoRenewals empty will disable the feature.

Patch works as expected.(Amended to format the commit message and to
remove a warn on line 112 / MV)
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 47e78f5c290f14c2af53e747ebae7ec317a0dbbd)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 14507 [QA Followup] - Restore comment, tidy sub
Kyle M Hall [Fri, 19 Feb 2016 12:51:21 +0000 (12:51 +0000)]
Bug 14507 [QA Followup] - Restore comment, tidy sub

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit f56ad87648ddef5cba66a4cbae9efb53a221c09a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 14507 Use checkpw to check password in Patron Info
Colin Campbell [Wed, 5 Aug 2015 11:55:41 +0000 (12:55 +0100)]
Bug 14507 Use checkpw to check password in Patron Info

Some devices are using patron information responses to validate
patron passwords to govern access to facilities as we
were using C4::Auth::checkpw_hash this only worked in a db password
context not other authentication routines.
The C4::Auth routines are not very consistent and there isnt a dropin
replacement for checkpw_hash this calls checkpw instead.
In a password only environment this behaves as the old version did
returning field CQ as Y if a valid password or no password is passed in
the patron info request and N if an incorrect password is supplied
It should also test against the appropriate authentication sources if
othere autrhentication schemes are in use

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Tested this with a client who reports that this enables SIP authentication to work correctly with their LDAP server.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 0810027bfadd50fe4b93088e9939327fd4c7f6e9)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 12549: (QA followup) missing newline in CLI dialog
Tomas Cohen Arazi [Tue, 16 Feb 2016 13:17:34 +0000 (10:17 -0300)]
Bug 12549: (QA followup) missing newline in CLI dialog

Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 002d7f45e5de35d2b052bf99d6d0dbc329775a3d)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 12549: Hard coded font Paths ( DejaVu ) cause problems for non-Debian systems
Nicholas van Oudtshoorn [Tue, 22 Dec 2015 04:25:47 +0000 (12:25 +0800)]
Bug 12549: Hard coded font Paths ( DejaVu ) cause problems for non-Debian systems

Allows for selection of DejaVu font path when installing from the command line. This
is useful for non-debian distributions that don't store the fonts in the same place.

Adds a new configuration variable to Makefile.PL: FONT_DIR

Defaults to the Debian install location for the fonts.

Test plan:
1. Run a CLI install, accepting the defaults.
2. Compare the generated koha-conf.xml to a
previous install - the font path for DejaVu fonts should be the same.
3. Run another CLI install, this time choosing a custom path for the fonts
4. Check that the path selected is reflected in the koha-conf.xml file.

NOTE: 'perl Makefile.pl' and 'make' generates blib/KOHA_CONF_DIR/koha-conf.xml
      ran with a weird string for the font dir
      copied that koha-conf.xml to my home dir
      reran with all defaults
      compared the two, and only the font paths differed.
      Also, I cleaned up the tabs that snuck in. :)

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 8c9fe6b2ddb7d9ba2113750d89c0be1e855e9b5d)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 13534: Update DB rev (3.22.03.002)
Brendan Gallagher [Tue, 23 Feb 2016 15:33:41 +0000 (15:33 +0000)]
Bug 13534: Update DB rev (3.22.03.002)

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 13534: Do not remove tags on deleting a patron
Jonathan Druart [Wed, 13 Jan 2016 14:34:29 +0000 (14:34 +0000)]
Bug 13534: Do not remove tags on deleting a patron

On deleting a patron, all the tags approved by this user will be
deleted.
This can cause data lost.

Test plan:
0/ Do not execute the update DB entry
1/ Create 2 patrons A, B
2/ Create some tags with patron A logged in
3/ Approve them with patron B logged in
4/ Delete the 2 patrons
=> The tags have been deleted
5/ Execute the DB entry
6/ Repeat 1,2,3,4
=> The tags have not been deleted and are still shown on the interface
(result, detail, tags module)

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit fb419ba83d8c7b6bf710b42ad3fe61701809fc0e)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15818 - OPAC search with utf-8 characters and without results generates encoding...
Dobrica Pavlinusic [Mon, 15 Feb 2016 14:23:19 +0000 (15:23 +0100)]
Bug 15818 - OPAC search with utf-8 characters and without results generates encoding error

When searching for something in OPAC which doesn't result in any results but have utf-8
characters in search string we get following encoding error:

Cannot decode string with wide characters at /usr/lib/i386-linux-gnu/perl5/5.20/Encode.pm line 215.

This is because we are trying to decode string which is allready correctly
marked as utf-8.

Test scenario:

1) enter search string with utf-8 characters in opac which doesn't
   return any results
2) verify that you get application error
3) apply this patch
4) re-run query and verify that errror is gone

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Step 0: Define "OPACNoResultsFound" with '{QUERY_KW}'
Note that I don't get the error (Encode 2.60) but the search terms are
not display correctly.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
The variable to be decoded comes from already decoded vars (via
the -utf8 flag from CGI), following the trail in Search.pm.

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit ea69693997fa5ea6f6eef37290c783b507db1213)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15810: Make sure the CGI->param is not called in a list context when creating...
Jonathan Druart [Fri, 12 Feb 2016 14:33:57 +0000 (14:33 +0000)]
Bug 15810: Make sure the CGI->param is not called in a list context when creating private shelves

This patch fixes the following bug:
If OpacAllowPublicListCreation is set to "not allow", the creation of a
private list raises an error at the OPAC.

CGI->param is called in a list context and some parameters are not
filled from the template if the pref is set to "not allow".
To make sure we don't have a "Odd number of elements in anonymous hash",
we force the context to scalar.

Test plan:
1/ Set OpacAllowPublicListCreation to "not allow"
2/ Create private and public lists at the OPAC and the intranet
=> Everything should work fine with this patch applied

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit d6329e4f96e46a5e2fbe0ced4d385c42d47e2a84)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15643 - Every datepicker on serials expected date column updates top issue
Lyon3 Team [Tue, 26 Jan 2016 11:40:11 +0000 (12:40 +0100)]
Bug 15643 - Every datepicker on serials expected date column updates top issue

delete 'expected' and 'supexpected' ids that don't seem useful anymore.
Same thing for changeDate2 function

Test plan :
1) Search a serial subscription from the Serials Home page
2)Go to serial collection page and make sure it has a mimimal bunch of
already received  or missing issues
3)Check some received issues to be sure to get extra issues (not only
the extected one) in the serial edition page
4) Click on Edit serials button
5) Try to modify whatever date in 'Expected on' column (excepted first
one) using datepicker :
You can see that the top date of the column is updated instead of the
choosen one.
6) Apply patch and redo 1 to 5 steps :
now the right date is updated.

Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 4c6214f5c943d8c2f12e7cf84c3965ddc4778956)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15552: Better wording of intranetreadinghistory
Aleisha [Mon, 11 Jan 2016 21:33:15 +0000 (21:33 +0000)]
Bug 15552: Better wording of intranetreadinghistory

To test:

1) Find intranetreadinghistory system preference in Administration
2) Confirm new description gives more information and makes sense

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Better wording and much better for translatability purposes

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit c827160122525c45000a4208215ee3fd83aa92b0)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15571 [QA Followup] - Remove tabs
Kyle M Hall [Fri, 22 Jan 2016 17:41:14 +0000 (17:41 +0000)]
Bug 15571 [QA Followup] - Remove tabs

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit eb542fb1ff91ca8416058c20692a0201f74596e3)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15571 reserveforothers permission does not remove Search to hold button from...
Briana [Mon, 18 Jan 2016 22:32:14 +0000 (22:32 +0000)]
Bug 15571 reserveforothers permission does not remove Search to hold button from patron account

To Test:
1. Create a user without 'reserveforothers' permission
2. Go onto user details
3. 'Search to hold' button should not be there
4. Create a user with 'reserveforothers' permission
5. Repeat steps
6. 'Search to Hold' button should be there

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Briana <brianagreally@gmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit f118addf0f559448cc8ffc13a522ff4b35718fd3)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15573: String and translatability fix to Patron Card Creator
Aleisha [Thu, 14 Jan 2016 22:00:41 +0000 (22:00 +0000)]
Bug 15573: String and translatability fix to Patron Card Creator

Fixing the split string

To test:

1) Go to Tools -> Patron Card Creator -> Manage -> Card batches
2) Confirm the table heading reads 'Patron Count'
3) Edit a batch
4) Click Remove duplicates
5) Confirm it reads 'Duplicates removed from batch number X: Y patron(s)'

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as described. Rewording Ok for translatability purpose

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit a3d2de6248386d0efc91c317f2c2e84d936198f6)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15358: Fix authorities merge
Julian Maurice [Wed, 6 Jan 2016 18:11:27 +0000 (19:11 +0100)]
Bug 15358: Fix authorities merge

Bug 8064 (Merge several biblio records) change some code used in both
biblios and authorities merge tool without updating the authorities
merge tool.
This patch fixes that.

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15578: Make sure all params will be taken into account when instantiating
Jonathan Druart [Thu, 14 Jan 2016 12:27:55 +0000 (12:27 +0000)]
Bug 15578: Make sure all params will be taken into account when instantiating

The tests in t/db_dependent/Koha_Authority.t expects at least 1
authority record in the DB to run them, otherwise they are skipped.
On our integration server, the DB does not contain any records, and the
tests are skipped.
Unfortunately these tests were testing the authid method of
Koha::MetadataRecord::Authority.

Test plan:
Apply the first patch, launch tests
=> Fail
Apply the second patch, launch tests
=> \o/

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15578: Insert authority records before processing tests
Jonathan Druart [Thu, 14 Jan 2016 12:27:32 +0000 (12:27 +0000)]
Bug 15578: Insert authority records before processing tests

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15411: Update DB rev (3.22.03.001)
Jesse Weaver [Fri, 12 Feb 2016 19:43:32 +0000 (12:43 -0700)]
Bug 15411: Update DB rev (3.22.03.001)

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15411: More changes
Aleisha [Wed, 6 Jan 2016 00:21:54 +0000 (00:21 +0000)]
Bug 15411: More changes

Changes to Italian and Polish sql files and catalogue help file.

TEST PLAN
---------
1) Confirm sql is valid and has Non-fiction.
   > delete from auth_vals;
   > source {appropriate file};
2) Staff -> Search -> Help
   -- Confirm Non-fiction
3) Run koha qa test tools

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit 81c9770f28d13129aa2969c4a243988a4f026a6b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15411: Changing 'Non fiction' to 'Non-fiction'
Aleisha [Tue, 22 Dec 2015 21:50:37 +0000 (21:50 +0000)]
Bug 15411: Changing 'Non fiction' to 'Non-fiction'

To test:

1) Apply patch
2) Run updatedatabase.pl
3) Go to advanced search in Staff Client (ie /cgi-bin/koha/catalogue/search.pl)
4) Confirm that it says 'Non-fiction' in the 'Any content' drop-down menu under 'Subtype limits'
5) Go to item search (ie /cgi-bin/koha/catalogue/itemsearch.pl)
6) Confirm that it says 'Non-fiction' under 'Collection code'
7) Go to advanced search in OPAC (ie /cgi-bin/koha/opac-search.pl) and click 'More options'
8) Confirm that it says 'Non-fiction' in the 'Content' drop-down menu
9) Go to the details page for a non-fiction book in the OPAC (ie /cgi-bin/koha/opac-detail.pl?biblionumber=2) and click 'Holdings' tab
10) Confirm that it says 'Non-fiction' under 'Collection' heading

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit 84e8cafca5e07ad4c2a7cf7129615d20cd9f5ab8)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoIncrement version for 3.22.3 release v3.22.03
Julian Maurice [Fri, 12 Feb 2016 10:00:56 +0000 (11:00 +0100)]
Increment version for 3.22.3 release

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoUpdate release notes for 3.22.3 release
Julian Maurice [Fri, 12 Feb 2016 09:57:29 +0000 (10:57 +0100)]
Update release notes for 3.22.3 release

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15760: Fix order by direction for shelves
Jonathan Druart [Thu, 11 Feb 2016 11:32:43 +0000 (11:32 +0000)]
Bug 15760: Fix order by direction for shelves

The order_by parameters should not be "$direction $order_by" with
quote_names enabled. The correct syntax is { -$direction => $order_by }

Test plan for Opac + Staff interfces:
Sort list by title or whatever and change the direction

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 71d4942c30f30fdbdf89a93f59e89a4f28e0dd3f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15760: Avoid SQL injections
Jonathan Druart [Thu, 11 Feb 2016 10:16:12 +0000 (10:16 +0000)]
Bug 15760: Avoid SQL injections

Asking on #dbix-class, ribasushi told me to set quote_names to the
connection options.

Indeed it does the fix, globally :)

Test plan:
1/ Add the following snippet to the a script (mainpage.pl is a good candidate)
 use Koha::Virtualshelves;
 my $s = Koha::Virtualshelves->search({}, { order_by => '1,(select case when (3*2*1=6 AND 000227=000227) then 1 else 1*(select table_name from information_schema.tables)end)=1' });
 $s->next;
2/ Execute the script
=> Without the patch, you should not get any error. If you have the mysql logs
enable, you will see the query
=> With the patch applied, you will get a "unknown column" error

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 16e55c1f3283402f766ed844baa5db333ed2f585)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15574: Better wording for error message when adding a duplicate tag
Aleisha [Thu, 14 Jan 2016 00:40:24 +0000 (00:40 +0000)]
Bug 15574: Better wording for error message when adding a duplicate tag

To test:

1) Apply patch
2) Go to a record (ie opac-detail.pl) and add tags that already exist with that record
3) Confirm new error message

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Rewording Ok for common patrons

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 56dde11a4f39b8a9f151d7592a7869f20c8c5f2f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15628: Remove get_branchinfos_of vestiges
Jonathan Druart [Wed, 20 Jan 2016 11:28:54 +0000 (11:28 +0000)]
Bug 15628: Remove get_branchinfos_of vestiges

The C4::Branch::get_branchinfos_of subroutine has been removed by bug
7034, but 2 occurrences have been left

git grep get_branchinfos_of
C4/Branch.pm:           &get_branchinfos_of
t/db_dependent/Branch.t:      get_branchinfos_of

Test plan:
  git grep get_branchinfos_of
should not return any occurrences.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Vestiges removed

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 7dc0c67640904a19a73e58c6af330af50d6d16d6)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15638: Spelling mistake in request.pl
Chloe [Thu, 21 Jan 2016 20:36:22 +0000 (20:36 +0000)]
Bug 15638: Spelling mistake in request.pl

To Test-
chek that in line 4 "writen" has been changed to "written"

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 0867ca53d689108475d2bdba94712d6839db928f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15638: spelling mistake in ~/Koha/reserve/placerequest.pl:4
Chloe [Thu, 21 Jan 2016 20:32:41 +0000 (20:32 +0000)]
Bug 15638: spelling mistake in ~/Koha/reserve/placerequest.pl:4

writen ==> written

To Test-
check that in line 4 of this file "writin" has been corrected to "written"

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 6bb0b6b2d90402bf1c618f32ddfde83529e63ba8)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 6322 - It's possible to view lists/virtualshelves even when virtualshelves is off
Owen Leonard [Wed, 23 Apr 2014 16:59:25 +0000 (12:59 -0400)]
Bug 6322 - It's possible to view lists/virtualshelves even when virtualshelves is off

If the user knows the URL for OPAC lists they can access them even with
the virtualshelves preference turned off. This patch copies the solution
added to opac-topissues.pl by Bug 10595 and applies it to OPAC lists
pages.

To test, apply the patch and set the virtualshelves system preference to
"don't allow."

- Navigate to /cgi-bin/koha/opac-shelves.pl. You should be redirected to
  an Error 404 page.
- Also check:
  - /cgi-bin/koha/opac-shareshelf.pl.
  - /cgi-bin/koha/opac-downloadshelf.pl
  - /cgi-bin/koha/opac-sendshelf.pl
  - /cgi-bin/koha/opac-addbybiblionumber.pl
- Turn virtualshelves back on. Access to lists and list sharing should
  be restored.

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 2923cfdff4466efed55dd3d3dbee8ba37f6ff882)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 14406: When adding messages in patron account, only first name is shown in pull...
Briana [Tue, 19 Jan 2016 00:57:34 +0000 (00:57 +0000)]
Bug 14406: When adding messages in patron account, only first name is shown in pull down

To test:

Log in to staff patron account
Go to Checkout tab
Click 'Add a new message'
Drop down box should show 'Staff - Internal Note' and 'OPAC - [Full name
of patron]'

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Made a tiny change during signoff: uncapitalized "note"

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit 9f4d87373abb8517e39c51cdde8fa17104196fea)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15684: Fix encoding issues with quote upload
Marc Véron [Thu, 28 Jan 2016 21:05:58 +0000 (22:05 +0100)]
Bug 15684: Fix encoding issues with quote upload

To verify:
- Download attachment 'Goethe with umlaut' from Bug 15684
- Go to Tools > Quote Editor
- Click "Import quotes" and select the file
- The quotes display in a table. Click 'Sav quotes'
- Result: Nothing happens

To test:
- Apply patch
- Repeat steps above
- Verify that you get a message '2 quotes saved' and that the quotes
  are added in to the quotes table
- Test with attachment 'sample quotes' as well

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 59fc32531071e3d4594a8b5555acd41a17921de3)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15687 [QA Followup] - Tidy sub to remove tab characters
Kyle M Hall [Thu, 28 Jan 2016 21:24:52 +0000 (21:24 +0000)]
Bug 15687 [QA Followup] - Tidy sub to remove tab characters

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 6d24219976c332c8fb7da69ceab6374627aeb95c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15687: Fix xgettext.pl syntax errors
Julian Maurice [Thu, 28 Jan 2016 08:32:11 +0000 (09:32 +0100)]
Bug 15687: Fix xgettext.pl syntax errors

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 70112cfb8103c9a760bf9b27e7ed8ecb8e5c9278)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 11569: Update DB rev (3.22.02.002)
Julian Maurice [Mon, 1 Feb 2016 16:55:15 +0000 (17:55 +0100)]
Bug 11569: Update DB rev (3.22.02.002)

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 11569: Correcting typos in userpermissions.sql
Aleisha [Mon, 21 Dec 2015 22:45:57 +0000 (22:45 +0000)]
Bug 11569: Correcting typos in userpermissions.sql

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit cc592b4b38f14813e3ee80c808dfde500e092bd1)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 14893: Update DB rev (3.22.02.001)
Julian Maurice [Mon, 1 Feb 2016 16:30:52 +0000 (17:30 +0100)]
Bug 14893: Update DB rev (3.22.02.001)

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 14893: Separate temporary storage per instance in Upload.pm
Marcel de Rooy [Fri, 25 Sep 2015 06:50:17 +0000 (08:50 +0200)]
Bug 14893: Separate temporary storage per instance in Upload.pm

To make life easier when multiple instances are uploading temporary
files to Koha, this patch adds the database name to the upload subfolder
in your /tmp folder.

Note: Although multiple instances could share the same subfolder for
temporary storage (hashvalue is based on a timestamp too), it will be
better to separate them for efficient housekeeping (removing older or
partial files with a cronjob etc.)
Since multiple instances come with separate permissions, keeping them in
separate folders will be much simpler.

Permanent storage is not affected by this patch. The location of permanent
storage is ruled by the upload_path in each config file. Sharing that
space is not recommended too.

Although it may not be strictly necessary yet to remove files from the old
temp storage folder (before the 3.22 release), the accompanying db rev
performs that housekeeping task.

Test plan:
[1] Do not yet apply this patch. Upload a temporary file (use the
    tools/upload.pl script without selecting a category).
[2] Check /tmp/koha_upload.
[3] Apply this patch. Run the db rev with web installer.
[4] Upload another temporary file.
[5] Check /tmp for folder [your_database]_upload.
[6] Check that /tmp/koha_upload is gone and the associated records too.
[7] Run the adjusted t/db../Upload.t

Followed test plan. Could not do steps before applying patch [1]-[2]
(I suppose a local permission problem).
After applying patch and updating db file appears in /tmp/[database]
as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 0c138700b21341b2fd79e53722605cb3e87fb9d2)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15298 [QA Followup] - Fix whitespace issues
Kyle M Hall [Tue, 19 Jan 2016 19:03:53 +0000 (19:03 +0000)]
Bug 15298 [QA Followup] - Fix whitespace issues

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit f98225c7c231926332bba9ec40de786aa58174d6)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15298 - z39.50 admin setup, options column suggested changes
Chloe [Tue, 19 Jan 2016 01:34:14 +0000 (01:34 +0000)]
Bug 15298 - z39.50 admin setup, options column suggested changes

To Test-
1-first look at the orginal Z39.50/SRU servers administration page
  (/cgi-bin/koha/admin/z3950servers.pl?op=delete_confirmed&id=6)
2-apply patch
3-now see the new styling of the "action" drop down tab like the one on
  the saved reports page
4-check that each link works (for delete i reccommend copying one then
  deleting the copy)

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 142c47fcf4ca966f153d7d60e2f448cb2f5c929d)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15472: Do not display links to circulation.pl if remaining_permissions is not set
Marc Véron [Tue, 5 Jan 2016 14:57:07 +0000 (15:57 +0100)]
Bug 15472: Do not display links to circulation.pl if remaining_permissions is not set

If permission 'circulate_remaining_permissions' is not set, links to 'Circulation'
(/circ/circulation-home.pl) on the intranet home page lead to an error
message: "Error: You do not have permission to access this page."

This patch hides the links if the permission is not set.

To test:
- Apply patch
- Log in to the intranet (staff client) with a patron who has the permission
  'circulate_remaining_pernissions' not set
- Verify that no links to Circulation appear on the intranet start page
  (menu top left and menu in main page area)
- Log in as a user who has the permission set.
- Verify that te links appear as appropriate.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 83936a6b821fe623a6bb7121d128a90107bf703c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15608: Spelling mistake in MARC21slim2OPACDetail.xsl
Gus [Tue, 19 Jan 2016 20:10:59 +0000 (20:10 +0000)]
Bug 15608: Spelling mistake in MARC21slim2OPACDetail.xsl

Seperate -> separate test - check if spelling is changed

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Typo fixed

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 6caae48c5a737ca7f08e29ff39eec7fba2562ed4)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15598: Also fixing space near exclamation mark in other files
Hector Castro [Tue, 19 Jan 2016 21:10:03 +0000 (15:10 -0600)]
Bug 15598: Also fixing space near exclamation mark in other files

To test:
-Check that the space near to exclamation mark (!) is fixed

Signed-off-by: Briana <brianagreally@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit d3b7ccc87e2da4666617122f05ece2250a7c1500)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15598: Typo in subscription-add.tt
Hector Castro [Tue, 19 Jan 2016 21:01:06 +0000 (15:01 -0600)]
Bug 15598: Typo in subscription-add.tt

Fix white space in exclamation mark in subscription-add.tt

To test:
-Check that the space near to exclamation mark (!) is now fix up

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 2e23e09a996584edd4b91ed134a0d6dab94ce0a9)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15597: Typo in opac-auth-detail.tt
Hector Castro [Tue, 19 Jan 2016 20:40:02 +0000 (14:40 -0600)]
Bug 15597: Typo in opac-auth-detail.tt

Patch fix a small type

To test:
- Verify that a double punctuation mark colon (:) is fix it.

Signed-off-by: Briana <brianagreally@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 386aafd8bda94581c4eaa070552bf9a025306ceb)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15589: Fix for the staff interface
Jonathan Druart [Wed, 20 Jan 2016 16:21:35 +0000 (16:21 +0000)]
Bug 15589: Fix for the staff interface

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 45f8f8fc2e0233396cb078f02269364732382c4a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15589: Changing 'his' to 'their' in OPAC lists
Aleisha [Mon, 18 Jan 2016 20:09:37 +0000 (20:09 +0000)]
Bug 15589: Changing 'his' to 'their' in OPAC lists

To be more gender neutral

To test:
1) Go to OPAC lists (opac-shelves.pl)
2) Confirm it now says "Allow anyone to remove their own contributed
   entries."

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 229cc7e8be66b61b2a0070a83d63cb7afb513d3f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15375 [QA Followup] - Fix non-functional restriction message and date
Kyle M Hall [Fri, 15 Jan 2016 18:20:09 +0000 (18:20 +0000)]
Bug 15375 [QA Followup] - Fix non-functional restriction message and date

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 43694867676ed627759a302ade7d666ab029490b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15375 [QA Followup] - Remove refereces to biblio and biblionumber for patron...
Kyle M Hall [Fri, 15 Jan 2016 18:02:49 +0000 (18:02 +0000)]
Bug 15375 [QA Followup] - Remove refereces to biblio and biblionumber for patron messages

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit a633af13b6851a15b71140ab123105d02c803da3)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15375 - Translatability: Fix issues on OPAC page 'Placing a hold'
Marc Véron [Tue, 15 Dec 2015 10:21:08 +0000 (11:21 +0100)]
Bug 15375 - Translatability: Fix issues on OPAC page 'Placing a hold'

Fix several issues with odd translations on opac-reserve.tt due to
string splitting by tags.
In addition, streamline messages to make them similar to the same
messages on the OPAC summary page (Bug 15374)

To test:
- Apply patch
- Log in to OPAC
  - with blocked /debarred user (with and without comment and date)
  - with user who has to much fines
  - with user who has his card marked as lost
  - with user with expired account
  - with user with uncertain address information
- Try to put holds
- Verify that message about why holds are not possible is correct
  and displays nicely and that links in messages work
- Carefully examine code
- Search for regressions

(Amended: stray i removed, test plan updated, removed account that
          is about to expire)

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
I am going to sign off on this because it works as it should and I think the problems I had in comment 8 are a separate bug.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit f0face38698b5c803604b37509edad98e2291bcd)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15190: Bad utf8 decode to unapi and fixing status code 200
Hector Castro [Tue, 12 Jan 2016 04:34:01 +0000 (22:34 -0600)]
Bug 15190: Bad utf8 decode to unapi and fixing status code 200

Fix bad utf8 decoding, also fix status code 200 for no parameters passed to
script

To reproduce the issue in OPAC
1) Copy from LOC (Z39.50) ISBN 8467020113 or test it with whichever record with
   special characters
2) Open URL in OPAC cgi-bin/koha/unapi?id=koha:biblionumber:4&format=oai_dc
   play with oai_dc, srw_dc, mods, mods-full, mods3, mods3-full, rdfdc.
   Note: marcxml does not fail
3) Enter the new biblionumber for ISBN 8467020113 or the record of your choise
4) An oai_dc record will display, notice about the bad utf8
   decoding characters
5) Search the record in OPAC
6) To reproduce code 200 Ok and 300 Multiple choices play with:
    cgi-bin/koha/unapi
    cgi-bin/koha/unapi?id=koha:biblionumber:4
7) If possible test in NORMARC (UNIMARC will launch an error because bug 15162)

Test plan
-Apply patch
-Follow steps 2 to 6
-You will see no errors in utf8

Followed test plan, works as expected.
Signed-off-by: Marc Veron <veron@veron.ch>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 283d80729a49c8821a5ce95bcf3affd24cce93e6)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15624: Spelling mistake in suggestion.pl
Gus [Wed, 20 Jan 2016 03:42:42 +0000 (03:42 +0000)]
Bug 15624: Spelling mistake in suggestion.pl

Test - due to noone being in a comparison name it was not changed
1. search for choosen, see that it was removed
2. search for agregate, see that it was removed

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Typos fixed

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 9c2b0ea1158f7c3cd47e3ece8aa6575f78cc304f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years ago15623 - Spelling mistake in boraccount.pl Test - Search for writen, if not found...
Gus [Wed, 20 Jan 2016 02:56:07 +0000 (02:56 +0000)]
15623 - Spelling mistake in boraccount.pl Test - Search for writen, if not found fix is correct

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Gus: You should try git grep writen one more time :)

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 17a2426e0f6ea79eeea7e70acb670111ee6fa5f5)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15621: Spelling mistake in printinvice.pl
Gus [Wed, 20 Jan 2016 02:45:16 +0000 (02:45 +0000)]
Bug 15621: Spelling mistake in printinvice.pl

Test- search for writen, if not found patch successful

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Typo fixed

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 12bd1dc60171fb9c85ef7176908a9f205190b2a6)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15619: Spelling mistake in memberentry.pl
Gus [Tue, 19 Jan 2016 23:13:57 +0000 (23:13 +0000)]
Bug 15619: Spelling mistake in memberentry.pl

Test - Check file for 'konw', notice no instance

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Typo fixed

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 89978bab103cbcf7e83e69d47851e9b0bc16238a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15614 - Spelling mistake in circ/pendingreserves.tt: Fullfilled
Chloe [Tue, 19 Jan 2016 20:40:34 +0000 (20:40 +0000)]
Bug 15614 - Spelling mistake in circ/pendingreserves.tt: Fullfilled

To Test:

Check if "fullfilled" has been changed to "fulfilled" in line 137

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 69b5fc9aa16891d7425685219a41078581ef2383)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15613: Fix 2 other occurrences of paramter vs parameter
Jonathan Druart [Wed, 20 Jan 2016 16:14:22 +0000 (16:14 +0000)]
Bug 15613: Fix 2 other occurrences of paramter vs parameter

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 6c80367f85b92f7b66c9b6255f836bc29f40d660)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15613 - Spelling mistake in opac-shelves.tt
Gus [Tue, 19 Jan 2016 20:28:43 +0000 (20:28 +0000)]
Bug 15613 - Spelling mistake in opac-shelves.tt

Spelling mistake in opac-shelves.tt paramter ==> parameter

To test - check the change is made in the file

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 9a109fde4caf3e983f086e60f61cf2fa59b225dd)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15611: Fix another implimented vs implemented
Jonathan Druart [Wed, 20 Jan 2016 16:10:33 +0000 (16:10 +0000)]
Bug 15611: Fix another implimented vs implemented

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 2723e463c0f3b9ee6cec77309bf5f2d97779be02)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15611 - Spelling mistake in patroncards/edit-layout.tt
Chloe [Tue, 19 Jan 2016 20:56:17 +0000 (20:56 +0000)]
Bug 15611 - Spelling mistake in patroncards/edit-layout.tt

To Test:

check that "implimented" has been changed to "implemented" on both lines
478 and 534

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 88607dfaf1d470a24b0b27d0ef4b2be8967cf93a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 14641: [SIGNED-OFF] Warns in subscription-add.pl
Aleisha [Mon, 11 Jan 2016 21:15:46 +0000 (21:15 +0000)]
Bug 14641: [SIGNED-OFF] Warns in subscription-add.pl

Removes warn using Jonathan's suggestion!

To test:
1) Reproduce warns by clicking New Subscription
2) Apply patch
3) Click New Subscription again
4) Confirm warns are gone

Signed-off-by: Magnus Enger <magnus@libriotech.no>
Patch removes the warn that come when clicking "New subscription"

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit fe7940257537042ff6ffab9c7b718e5b8a5dc368)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 14480: Silences warn from editing patron
Aleisha [Tue, 29 Dec 2015 19:39:20 +0000 (19:39 +0000)]
Bug 14480: Silences warn from editing patron

Argument "" isn't numeric in numeric lt (<)

TEST PLAN
---------
1) Go to any patron in staff client
2) Click 'Edit'
3) Check error logs
   -- warnings should exist.
4) Apply patch
5) Reload page
   -- warnings should not be triggered.
6) Add restriction and save
7) Go back to edit screen
   -- restriction should be shown
8) Remove restriction and save
9) Go back to edit screen
   -- Should say "Patron is currently unrestricted"
10) Run koha qa test tools.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 11109501eb6c8b8ee55390cd9860ac6dbf8c908c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15553: [QA Follow-up] Replace hardcoded tmp and add instance to dirname
Marcel de Rooy [Wed, 13 Jan 2016 10:16:02 +0000 (11:16 +0100)]
Bug 15553: [QA Follow-up] Replace hardcoded tmp and add instance to dirname

If you use multiple instances on one server, you could have the situation
that instance A creates the cgisess subfolder and instance B could have a
permission problem. This patch resolves that by allowing each instance to
have its own cgisess subfolder.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit c4934b2dab427da4304913b3f0f26e0a24606896)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15553 - [SIGNED-OFF] cgisess_ files polluting the /tmp directory
Blou [Mon, 11 Jan 2016 21:41:11 +0000 (16:41 -0500)]
Bug 15553 - [SIGNED-OFF] cgisess_ files polluting the /tmp directory

When some users want to improve performance, one suggestion is to switch the syspref "sessionstorage" to 'tmp',
which store the session info in the /tmp directory instead of the database.

Depending on the frequency of the cleaning process (or lack thereof),
this can be heavy pollution into the /tmp directory, making it unusable.
"rm cgi*" would not even work since cgi* extends to over 8000 items...

A simple fix is to modify the target directory in C4/Auth.pm to /tmp/cgisess.

Testing scenario:
1) change the syspref SessionStorage to 'tmp'
2) Log into the OPAC, validate that a file named /tmp/cgisess_(something) got created
3) Apply the patch
4) Log into the OPAC, validate that a file /tmp/cgisess/cgisess_(something) got created

Signed-off-by: Magnus Enger <magnus@libriotech.no>
Works as advertised. Session files are created in /tmp/cgisess/ instead
of directly in /tmp. I usually store sessions in memcached, but a
couple of times memcached has died on me, and before I knew it, /tmp
was so full of sessions files, I could not easily delete them with
"rm /tmp/cgisess*". Being able to delete /tmp/cgisess/ should be a
bit easier.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 3815915a3338c4380da7773acc675b07ac82562d)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15468 - Search links on callnumbers with parentheses fails on OPAC results page
Chloe [Tue, 19 Jan 2016 03:09:50 +0000 (03:09 +0000)]
Bug 15468 - Search links on callnumbers with parentheses fails on OPAC results page

To Test:
1-before plugin search in opac for a call number with either a "(" or a ")" in it
2-it should come back with no results
3-use plugin
4-re-search the call number with "(" or ")"
5-the search should come back with results

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
It seems this only works with OPAC XSLT for results page turned off
and OPACItemsResultsDisplay turned on. - Then the callnumbers
in the result list will be linked for searching.

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 6d9a75014e1f1ef7dc84a3d14643271658eacc2e)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15592 - spelling mistake in ~/Koha/koha-tmpl/intranet-tmpl/p./plugins/plugins...
Chloe [Tue, 19 Jan 2016 21:18:09 +0000 (21:18 +0000)]
Bug 15592 - spelling mistake in ~/Koha/koha-tmpl/intranet-tmpl/p./plugins/plugins-upload.tt

To Test:

checkthat "extention" has been changed to "extension" on line 27

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 70086f1681155d8e63c9ee1b149c3f812df8f125)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years ago Bug 15444 - MARC21: Repeated 508 not correctly formatted (missing separator)
Winona Salesky [Mon, 4 Jan 2016 14:33:00 +0000 (09:33 -0500)]
 Bug 15444 - MARC21: Repeated 508 not correctly formatted (missing separator)

This patch adds a separator for multiple 508 fields to the XSLT display in the staff and OPAC detail view.
Separator is wrapped in span with class=‘separator’ for easy manipulation via css.

To test:
* Search the OPAC
* Click the title with multiple 508 fields
* Make sure the fields display properly
* Repeat for a few more titles
* Repeat in the Staff Client

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 1c5f75fde534db8a2b1329d5dfb83d34d9d29982)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15100: MARC21 - make display of "Dates associated with a name" optional
Katrin Fischer [Sat, 21 Nov 2015 23:29:32 +0000 (00:29 +0100)]
Bug 15100: MARC21 - make display of "Dates associated with a name" optional

With the changes for RDA now more subfields for the fields
100, 110, 111, and 700, 710, 711 are displayed.
One of them is $d - Dates associated with a name

This patch adds separate treatment of the $d subfield and
wraps it in a span with the class "authordates".
This makes it possible to hide the information with CSS.

To test:
- Make sure you have several records with $d catalogued
- Check the display in result list and detail page
  with and without the page.
- Check, if there is a difference in display
- Check if the dates are correctly wrapped in a span
- Try to hide the information, using the following
  entry in your *UserCSS preferences:
  .authordates { display: none; }

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised

Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 2f85d659a1ce76cc48bf53e07ce908b47fdce3c6)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15476: Listname not always displayed in shelves.pl
Marc Véron [Wed, 6 Jan 2016 09:29:01 +0000 (10:29 +0100)]
Bug 15476: Listname not always displayed in shelves.pl

To reproduce:
  - In staff client, go to List and click on the name of an
    existing list.
  - At the bottom of the screen, you see a title "Add an item to "
    but no list name.

To test:
  - Apply patch
  - Verify that listname appears after "Add an item to "

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised. Label/legend for listname displayed Ok

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit df13a5d3e7727f6a7db67aac618fb85c135b2723)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15195 - patron details should open in tab
Natasha [Tue, 19 Jan 2016 01:09:15 +0000 (01:09 +0000)]
Bug 15195 - patron details should open in tab

Deleted View record link and made patron details open in a new tab.

To Test: Edit personal details for a user on opac and submit update
request.

In staff client go to patrons requesting modifications.
Confirm view record link is gone and patron details opens in new tab.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
I don't think it's a good idea to open a new tab (let the user decide)
but the behavior already existed before this patch.

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 8b23b13d38c51cc10f9fcdf78f4afe1028119ad4)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 14624 - <<items.content>> for advance_notices.pl wrongly documented
Natasha [Tue, 19 Jan 2016 02:51:49 +0000 (02:51 +0000)]
Bug 14624 - <<items.content>> for advance_notices.pl wrongly documented

To Test Check perldoc for misc/cronjobs/advance_noitces.pl
and see that the documentation matches.

Ran:
$ perldoc misc/cronjobs/advance_noitces.pl
Saw expected changes.
Koha QA test tools pass too.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Switched due date for the name of the database column
date_due as the parameter expects a list of database
column names.

(cherry picked from commit 4120e48b0ffe974636f8b070ea3c3f3956948409)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15609 - spelling mistake in :692: writen ==> written
Chloe [Tue, 19 Jan 2016 21:02:13 +0000 (21:02 +0000)]
Bug 15609 - spelling mistake in :692: writen ==> written

To test:

Check that "writen" has been changed to "written" on line 692

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit f37ce198feae78b82b751f1c3d682010b4db0305)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15299: Ask for confirmation when deleting a report from second page
Jonathan Druart [Thu, 7 Jan 2016 12:50:35 +0000 (12:50 +0000)]
Bug 15299: Ask for confirmation when deleting a report from second page

Some link are hidden when loading the page, by DataTables, we need to
use the delegate jQuery method to attach a handler to the click event
for all delete links (the ones existing when loading the page, and the
ones displayed in the future).

Test plan:
Have more than 20 reports defined
Go on the report list view, then change the number of elements
displayed, click "action>delete". You should get a warn.

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Confirm that there is now a confirmation on delete from the list -> action menu

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit dcce65c8fd6f6d4963a3dd0e8b73a79548a2aa8b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt

8 years agoBug 14810 Improve messages in patron anonymizing tool
Briana [Tue, 19 Jan 2016 01:21:50 +0000 (01:21 +0000)]
Bug 14810 Improve messages in patron anonymizing tool

To test:
Create circulation records
Go to 'http://localhost:8081/cgi-bin/koha/tools/cleanborrowers.pl'
Anonymize patron checkout history
Message should read 'All checkouts older than [date] have been
 anonymized
When patch is not applied, message reads 'All patrons with checkouts
 older than [date]  have been anonymized"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit e38564d2132e1e102cec23d239fb81cd987b3de8)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 14555: Warns in opac-search.pl
Martin Stenberg [Mon, 21 Sep 2015 11:16:39 +0000 (13:16 +0200)]
Bug 14555: Warns in opac-search.pl

Avoid use of uninitialized value in split

== Test plan ==
1. Go to opac advanced search
2. Click "Search" without any search query
3. Log file will show "Use of uninitialized value in split at ..."
4. Apply this patch
5. Repeat step 1 and 2
6. Log file should no longer show "Use of uninitialized value in split at ..."

Sponsored-by: Regionbibliotek Halland / County library of Halland
Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
At step 2 you have to check a criteria

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit ab81a0feeebf1c01857755f53060dcc255960e9b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 12636: Do not display unique patron attributes in the batch patron modification
Jonathan Druart [Mon, 21 Dec 2015 12:31:59 +0000 (12:31 +0000)]
Bug 12636: Do not display unique patron attributes in the batch patron modification

Batch patron modification should not offer to update patron attributes
with values which are designated as unique since such attributes are
required to be unique to a single patron.

Test plan:
Create some patron attributes, some should be unique.
Use the batch patron modification tool to modify patrons.
With this patch, the patron attributes marked as unique won't be
display anymore.

Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit b7b94b7012704d99a91ce32723404095a68fe6f1)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 14133: Print notices should be generated with the print template
Jonathan Druart [Fri, 21 Aug 2015 09:43:13 +0000 (10:43 +0100)]
Bug 14133: Print notices should be generated with the print template

If the overdue notice to send is an email or a SMS and the patron does
not provided such information, a print notice is generated.
But it will be generated with the email or sms template, which is not
useful, especially in the SMS case.

The template to use should be the print one.

Test plan:
0/ Does not apply this patch and Correctly define the overdue rules to generate
an overdue notice to the message_queue table.
Check email + SMS
1/ Define an email address and a SMS number for a patron
2/ Generate the overdue notices (misc/cronjobs/overdue_notices.pl [-t])
3/ 2 notices should have been generated:
    mtt=email with the email template used
    mtt=sms   with the sms template used
4/ Truncate the message_queue table
5/ Remove the email address and repeat 2
6/ Only 1 notice should have been generated:
    mtt=print with the email template used
7/ Truncate the message_queue table
8/ Remove the sms alert number and repeat 2
9/ 2 notices should have been generated:
    mtt=print with the email template used (or sms I suppose)

10/ Apply this patch and repeat previous steps.
The print notices should be generated with the print template.

IMPORTANT NOTE: This test plan does not take into account the notices
generated for the staff ("These messages were not sent directly to the
patrons."). However the behavior will also change, the print template
will be used in all cases. Is it what we want?

Signed-off-by: Chris <chris@bigballofwax.co.nz>
Seems fine by me

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 581759e985c170db0edb4a895cda641930e5ac11)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15577: Correcting link redirect
Aleisha [Thu, 14 Jan 2016 02:33:23 +0000 (02:33 +0000)]
Bug 15577: Correcting link redirect

To test:
1) Add a restriction to a user
2) Log in as that user in the OPAC
3) Click 'your account page' link in the yellow mesage
4) Confirm you are taken to opac-account.pl

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 5b6457087d0c8be00cbe3d54a7e157706f74908b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15355: Translatability: Fix issues on check in page
Marc Véron [Fri, 11 Dec 2015 17:06:10 +0000 (18:06 +0100)]
Bug 15355: Translatability: Fix issues on check in page

This patch fixes translatability issues on checkin page, due to sentence splitting by html tags at
several places and ambiguous word 'to'.

Additionally, fix message related to syspref AllowReturnToBranch set to 'only the library where the
item is checked out from' (it wrongly displays the home library instead of the holding library),
and streamline the display of similar messages to look more consistent.

To test:
- Apply patch
- Go to Home > Circulation > Check in
- Do check ins with different expected results / messages
- Verify that the messages are meaningful and display nicely
- Play with items checked out / checked in at different branches (home branch, holding branch, other
  branch) and different settings for syspref 'AllowREturnToBranch' and verify that the messages display
  properly (with correct home rsp. holding branch)
- Carfully review code changes.

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit ee64d19fab61bc2e4f4e78e698802cf3d4bc3d1c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 4912: Redirect to the appropriate view after editing/deleting a list
Jonathan Druart [Wed, 6 Jan 2016 14:25:14 +0000 (14:25 +0000)]
Bug 4912: Redirect to the appropriate view after editing/deleting a list

There are 2 places where a list can be edited/deleted: on the list view
and the list content view. After the edition, the user expect to be
redirect to the previous page.
This patch implements that.

Test plan:
At the OPAC, delete and edit a list from the 2 differents places.
Confirm that you are redirect to the page you come from.

With patch, redirects work as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 6a2bf8d31b1fbe1d83a66d314bc97be41af65ca7)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15576: Fix for incorrect link redirect
Aleisha [Thu, 14 Jan 2016 02:26:34 +0000 (02:26 +0000)]
Bug 15576: Fix for incorrect link redirect

To test:

1) Edit a user to have an uncertain address (gone no address)
2) Log in as that user on OPAC
3) Click 'online update form' link in the yellow message
4) Confirm you are taken to opac-memberentry.pl

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as described

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 1eda96edc515cdca38ffa8262e24de933a18ce10)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years ago Bug 15357: Display existing holds even if no items exist
Jonathan Druart [Mon, 14 Dec 2015 09:32:50 +0000 (09:32 +0000)]
 Bug 15357: Display existing holds even if no items exist

If all the items have been deleted for a record and holds exist, the
holds are not displayed.
You are not able to delete the items from the record detail page, but
you can from the items page.

Test plan:
1 - Place 1 or more title level holds on a record.
2 - Delete each item individually.
3 - Note that you see the number of holds on the record details page
With this patch, that holds are accessible via the holds tab.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 0e4b703d239551207ca72c5b201475418c7cfd9c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 14015 - Checkout: Fix software error if barcode '0' is given
Marc Véron [Mon, 28 Dec 2015 11:15:18 +0000 (12:15 +0100)]
Bug 14015 - Checkout: Fix software error if barcode '0' is given

To reproduce the bug:
- Go to Home > Circulation > Checkouts > [a patron]
- Enter 0 (zero) in barcode field and hit Enter

Result:
Software error
  Can't use string ("1") as a HASH ref while "strict refs" in use
  at /usr/share/kohaclone/circ/circulation.pl line 473

To test:
- Apply patch
- Repeat steps above
- Verify that the sofware error is gone and that you get a
  message as with other invalid barcodes.
- Test with other values: '00', '000', existing barcode,
  and a barcode that does not exist
- Test with empty barcode (for printing slip)
- Search for regressions

This patch implements Jonathan's solution (see comment #15)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 9afc8e96f3d173a3998cbec2a4ad7ceaf506e49a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15353: Display the patron image where needed
Jonathan Druart [Tue, 5 Jan 2016 14:37:20 +0000 (14:37 +0000)]
Bug 15353: Display the patron image where needed

On the 3 following pages, the patron image was not displayed:
   members/discharge.pl
   members/pay.pl
   members/paycollect.pl

Test plan:
Apply this patch and confirm the image is now displayed

Followed test plan, image displays as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit bb0c2fce1b87222933bfa5dd02ca614521ba2a0c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15135: Remove Warning Subroutine HasOverdues redefined
Marc Véron [Mon, 11 Jan 2016 10:59:14 +0000 (11:59 +0100)]
Bug 15135: Remove Warning Subroutine HasOverdues redefined

In staff client, while displying patron related pages (e.g. moremember.pl) you get a warning like:
moremember.pl: Subroutine HasOverdues redefined at /usr/share/kohaclone/Koha/Template/Plugin/Borrowers.pm line 52.
This occurs with all pages that have [% USE Borrowers %] in their templates (directly or via members-toolbar.inc)

To test:
- Go to Home > Patrons > Patron details for....
- Search for warning above in log
- Apply patch
- Verify that no more warnings appear
- Verify that patron pages behave as before

(Solution as of comment #18)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Verified that warning disappears with this patch.

Signed-off-by: Jacek Ablewicz <abl@biblos.pk.edu.pl>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 560bc790db6d3f8f2ff6b4e70db148445ff645e4)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 13177: Accidental copy/paste error fix
Aleisha [Tue, 12 Jan 2016 22:15:23 +0000 (22:15 +0000)]
Bug 13177: Accidental copy/paste error fix

Confirm it now says Rotating Collections instead of Patron Import in the last line, and the link is correct.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit eacbfb2069b155af80ef88473c46bfc130c6c070)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 13177: Help page for Rotating Collections
Aleisha [Mon, 21 Dec 2015 21:27:00 +0000 (21:27 +0000)]
Bug 13177: Help page for Rotating Collections

To test:

Go to Tools -> Rotating Collections and click Help in the top-right. Confirm the Help page shows and gives correct accurate instructions with no typos or grammatical errors.

Help displays as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit b9e5aee1b66be893354733b6710b1df1b04edeb1)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15398: Hide Staff members only in the patron deletion/anonymization tool
Jonathan Druart [Tue, 5 Jan 2016 15:41:36 +0000 (15:41 +0000)]
Bug 15398: Hide Staff members only in the patron deletion/anonymization tool

On bug 9076 (commit 568a4c1230ee9a4002181fcab2c083faf6c323a9), the plan
was to hide the Staff members from the tool.
But the test was wrong, it was done on the category_code instead of the
category_type value.

Test plan:
1/ Create a category 'Student' which is not part of the Staff
(category_code=S, category_type!=S)
2/ Create a staff category (category_type=S)
3/ Go on the deletion/anonymization tool (tools/cleanborrowers.pl) and
confirm that the category Student category is displayed in the dropdown
list.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described, no errors.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
http://bugs.koha-community.org/show_bug.cgi?id=15308

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 6f0cdee69b670f1c49693198e335deb26470d961)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
8 years agoBug 15391: Fix HoldsQueue.t tests
Jonathan Druart [Tue, 19 Jan 2016 16:58:07 +0000 (16:58 +0000)]
Bug 15391: Fix HoldsQueue.t tests

Prior to this patch, in HoldsQueue.t:
 63 my @item_types = C4::ItemType->all;
 64 my $itemtype = grep { $_->{notforloan} == 1 } @item_types
 65   or BAIL_OUT("No adequate itemtype");

Then we use the $itemtype variable (which contains the number of item types not for loan):

 92 $dbh->do("INSERT INTO biblioitems (biblionumber, marcxml, itemtype)
 93           VALUES                  ($biblionumber, '', '$itemtype')");

There is obviously something wrong here.

The code should be

 64 my @not_for_loan = grep { $_->{notforloan} == 1 } @item_types
 65   or BAIL_OUT("No adequate itemtype");
 66 my $itemtype = $not_for_loan[0]->{itemtype};

But then some tests don't pass:

Actually the problem comes from:
commit bfbc646fdd9ca4b90a0bc2751d0faa95d9e93ba1
  Bug 10336: HoldsQueue.t needs to create its own data

-my $itemtype = $dbh->selectrow_array("SELECT min(itemtype) FROM itemtypes WHERE notforloan = 0")
+my @item_types = C4::ItemType->all;
+my $itemtype = grep { $_->{notforloan} == 1 } @item_types

The line should have been:
my $itemtype = grep { $_->{notforloan} == 0 } @item_types

Test plan:
Confirm that the tests still pass after this patch applied.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
All tests pass pre and post patch

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit b340d1f5bd02e1ddb535db13e321e6b07a166725)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>