Commit Graph

25101 Commits

Author SHA1 Message Date
Gus 0ae2f92d0d 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 6caae48c5a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 16:15:18 +01:00
Hector Castro 7db70b33a4 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 d3b7ccc87e)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 16:14:43 +01:00
Hector Castro 75330b3df7 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 2e23e09a99)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 16:14:41 +01:00
Hector Castro 6cb7dc0c0a 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 386aafd8bd)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 16:13:54 +01:00
Jonathan Druart d9bf114854 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 45f8f8fc2e)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 16:13:20 +01:00
Aleisha d26086a84c 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 229cc7e8be)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 16:13:19 +01:00
Kyle M Hall db2a954579 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 4369486767)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 16:06:33 +01:00
Kyle M Hall 73bf2f2dc8 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 a633af13b6)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 16:06:32 +01:00
Marc Véron dceb3ed022 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 f0face3869)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 16:06:29 +01:00
Hector Castro 4f976932a4 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 283d80729a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 16:05:11 +01:00
Gus ac36fe478a 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 9c2b0ea115)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 16:02:01 +01:00
Gus d5dd89ff78 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 17a2426e0f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 16:02:00 +01:00
Gus e23abce8dd 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 12bd1dc601)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 16:01:58 +01:00
Gus 45095c0078 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 89978bab10)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 15:59:49 +01:00
Chloe 644e69cb7f 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 69b5fc9aa1)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 15:59:45 +01:00
Jonathan Druart 8013976d3e 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 6c80367f85)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 15:59:43 +01:00
Gus 314f1f7a2f 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 9a109fde4c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 15:59:42 +01:00
Jonathan Druart 6c1b8ddffe 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 2723e463c0)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 15:59:40 +01:00
Chloe 74680de736 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 88607dfaf1)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 15:59:39 +01:00
Aleisha 0e6346c614 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 fe79402575)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 15:51:56 +01:00
Aleisha c08a13593c 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 11109501eb)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 15:49:39 +01:00
Marcel de Rooy d259eaac7b 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 c4934b2dab)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 15:48:20 +01:00
Blou 6efb2ebc0f 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 3815915a33)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 15:48:18 +01:00
Chloe 27f9eb0119 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 6d9a75014e)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 15:44:28 +01:00
Chloe 841aa118e5 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 70086f1681)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 15:43:32 +01:00
Winona Salesky c68d58259e 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 1c5f75fde5)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 15:42:26 +01:00
Katrin Fischer ff722b48e8 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 2f85d659a1)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 15:40:19 +01:00
Marc Véron 67c26ef476 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 df13a5d3e7)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 15:34:01 +01:00
Natasha 259e590928 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 8b23b13d38)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 15:23:45 +01:00
Natasha b3586e5dc7 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 4120e48b0f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 15:18:42 +01:00
Chloe 87e96810fc 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 f37ce198fe)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 15:13:27 +01:00
Jonathan Druart dfdf3c15de 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 dcce65c8fd)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

Conflicts:
	koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
2016-01-29 15:10:28 +01:00
Briana 2f3843af99 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 e38564d213)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 15:05:37 +01:00
Martin Stenberg 34f20412f8 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 ab81a0feee)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 15:04:29 +01:00
Jonathan Druart 4c0506f33e 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 b7b94b7012)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 14:50:58 +01:00
Jonathan Druart d55a5ca464 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 581759e985)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 14:43:43 +01:00
Aleisha 7cfa560631 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 5b6457087d)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 13:41:28 +01:00
Marc Véron d11bc6f6b8 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 ee64d19fab)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 13:23:02 +01:00
Jonathan Druart dcebc487e5 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 6a2bf8d31b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 13:21:51 +01:00
Aleisha c45f200653 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 1eda96edc5)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 13:18:05 +01:00
Jonathan Druart 2903bc2909 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 0e4b703d23)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 12:17:47 +01:00
Marc Véron 80c042cf41 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 9afc8e96f3)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 12:13:31 +01:00
Jonathan Druart 64eb1f88ea 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 bb0c2fce1b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 12:11:52 +01:00
Marc Véron ff2fc4910d 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 560bc790db)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 11:50:14 +01:00
Aleisha 7c806c91d0 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 eacbfb2069)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 11:48:15 +01:00
Aleisha 16b78e412f 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 b9e5aee1b6)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 11:48:13 +01:00
Jonathan Druart 5349313187 Bug 15398: Hide Staff members only in the patron deletion/anonymization tool
On bug 9076 (commit 568a4c1230), 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 6f0cdee69b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 11:47:15 +01:00
Jonathan Druart 31ab3b277c 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 bfbc646fdd
  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 b340d1f5bd)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 11:44:43 +01:00
Marcel de Rooy 69fd29942c Bug 9754: koha-remove optionally includes var/lib and var/spool
Currently, the files in the folder /var/lib/koha/[instance] and also
in /var/spool/koha/[instance] are not removed.
This patch adds the option -p|--purge-all to include those two
directories when removing files.

Note: There was a small bug in the for loop. On the -k line the extra
shift statement is one too much.

NOTE: Verify that you use the adjusted koha-remove in the test plan
and not accidentally an older version of this script.

Test plan:
[1] Create an instance test.
[2] Run koha-remove and verify that /var/lib/koha/test still exists.
[3] Create an instance test2.
[4] Run koha-remove -k -p and verify that the sql database still exists
    but the two instance folders in var/lib/koha and var/spool/koha are
    gone.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 1d99fa026b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 11:40:52 +01:00
Jonathan Druart 7132c9b49c Bug 15209: Check the parameter at the beginning of the subroutines
It seems better to check if parameters exist at the beginning of a
subroutine.
It makes the code easier to read and there is 1 indentation level less.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 372881ebfd)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-29 11:35:48 +01:00