]> git.koha-community.org Git - koha.git/log
koha.git
8 years agoBug 15697: Unnecessary comma between title and subtitle on opac-detail.pl
Nick Clemens [Thu, 28 Jan 2016 20:33:58 +0000 (20:33 +0000)]
Bug 15697: Unnecessary comma between title and subtitle on opac-detail.pl

To test:
1 - Go to Administration->Keyword to MARC mapping
2 - Add a mapping (or ensure it exists)
    Field name: subtitle
    MARC field: 245
    MARC subfield: b
3 - View a record with a subtitle in the opac
4 - Note in MARC 21 you have "Title of record:, subtitle of record"
5 - Apply patch
6 - View the record again and note the comma is no longer present.

Note: this patch removes the comma only for MARC21 where subtitle is not
repeatable. UNIMARC seems to be repeatable and does not include
punctuation so I believe this may be needed there.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as described. Comma removed from title of the window and breadcrumb
section

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e19db8ca32dd776263b73474ece4e17d88ab17b4)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 889a2f7a6c96e8b4d597b60464b6110098da7518)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15940 - Remove unused JavaScript from authorities MARC subfield structure
Owen Leonard [Mon, 29 Feb 2016 18:39:16 +0000 (13:39 -0500)]
Bug 15940 - Remove unused JavaScript from authorities MARC subfield structure

The authorities MARC subfield structure template contains some unused
JavaScript, "function displayMoreConstraint()" This patch removes it.

To test, apply the patch and go to Administration -> Authority types ->
MARC structure -> Subfields -> Edit subfields and confirm that there are
no JavaScript errors and tab switching works correctly.

A search of the source code should show no instances of
"displayMoreConstraint."

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
  No regression, no JS warning.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 3f70b4660bf57e854e6ef13b04fb29de57c53bec)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 3c9ed309ba2e308800e9c596c3c28d4a911813d2)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15926: Add help for item search fields admin
Nicole C Engard [Fri, 26 Feb 2016 16:03:26 +0000 (16:03 +0000)]
Bug 15926: Add help for item search fields admin

This patch will add the missing help file to the item
search fields admin page.

To test:
* Go to administration > Item search fields
* Click Help
* Confirm help is there and correct.

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 ac3e13248abd9687bbce764d1f1b6be39921b552)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit e9b25fb1a182d4fc58fa1104b7cd896f7c7cc97d)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15884 - Vendor contract deletion warning is incorrectly styled
Owen Leonard [Tue, 23 Feb 2016 14:16:13 +0000 (09:16 -0500)]
Bug 15884 - Vendor contract deletion warning is incorrectly styled

When deleting a contract in  Acquisitions -> Vendor -> Contracts, the
deletion confirmation message is not styled with the standard "dialog
alert" <div>. This patch modifies the confirmation markup to match the
standard.

To test, apply the patch and go to Acquisitions -> [ a vendor] ->
Contracts

- Try deleting a contract. The confirmation box should have the standard
  "dialog alert" class.
- Test the 'confirm' and 'cancel' actions and make sure both complete
  correctly.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit a4f1103e416357dc0635f4d5347d50ff68457459)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15808 - Remove "Return to where you were before" from sysprefs
Marc Véron [Fri, 12 Feb 2016 09:19:00 +0000 (10:19 +0100)]
Bug 15808 - Remove "Return to where you were before" from sysprefs

This patch removes the link 'return to where you were before' from
syspref search result page after failing search.

To test:
- Apply patch
- Go to System preferences in staff client, do a search
  with something that does not exist
- Verify that a message pops up that does not contain the link.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 34b79932f79f83fbca528083cacbb61f157c05cb)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 4cbc77e639f3b3dde46067711a1c8d59d6384213)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15804: Use standard dialog style for confirmation of MARC subfield deletion
Owen Leonard [Thu, 11 Feb 2016 17:23:49 +0000 (12:23 -0500)]
Bug 15804: Use standard dialog style for confirmation of MARC subfield deletion

When deleting a MARC framework subfield, the confirmation message is not
styled. This patch modifies the template to style the confirmation
message like similar ones.

To test, apply the patch and go to Administration -> MARC framworks.

 - Click 'MARC structure' for a framework you can edit.
 - Click 'subfields' for a tag you can edit.
 - Click 'Delete' for a subfield you can delete. You should see a
   confirmation dialog styled like other "alert" type dialogs.
 - Test both canceling and confirming deletion to confirm that both
   function correctly.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 8323259d8401907975446af35f2a018748d35e40)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15784: Library deletion warning is incorrectly styled
Owen Leonard [Wed, 3 Feb 2016 13:40:20 +0000 (08:40 -0500)]
Bug 15784: Library deletion warning is incorrectly styled

When deleting a library in Administration ->  Libraries and groups, the
deletion confirmation message is not styled with the standard "dialog
alert" <div>. This patch modifies the confirmation markup to match the
standard.

To test, apply the patch and go to Administration -> Libraries and
groups.

- Try deleting a library. The confirmation box should have the standard
  "dialog alert" class.
- Test the 'confirm' and 'cancel' actions and make sure both complete
  correctly.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit cfb46e45cb74fdc4a42bb48df78fe820d31fdc86)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15721: (QA followup) pick the most probable first
Tomas Cohen Arazi [Tue, 1 Mar 2016 13:12:29 +0000 (10:12 -0300)]
Bug 15721: (QA followup) pick the most probable first

Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 16548d39840c92d43a64ca08f63231156935c41c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 5edc50888d7e1328919c0e60b6baeb0eb5dd02ba)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15721: (followup) Add apache2ctl to C4::Context::get_versions
Marc Véron [Fri, 19 Feb 2016 15:52:48 +0000 (16:52 +0100)]
Bug 15721: (followup) Add apache2ctl to C4::Context::get_versions

See comment #6

Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 019634fc5b010324de8adde38f49239a816a519c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit f4272b467cfe098d8031cb18353ff06f915c5172)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15721: About page does not display Apache version
Marc Véron [Tue, 2 Feb 2016 10:34:16 +0000 (11:34 +0100)]
Bug 15721: About page does not display Apache version

This patch changes about.pl to get version information from
C4::Context where applicable and fixes missing display of
the Apache version e.g. for Apache/2.2.22

To test:
- Without patch, open about page in staff client
- Remember contents of tab 'Server information'
  (e.g. make a screenshot)
- Apply patch
- Verify, that the About page displays the same information
  as before rsp. additionally displays Apache version if
  it was missing without patch.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as described
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit c2fe13c13ad286e6fc67240624eee6d95c5e7334)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 62bf20ad39377a61e7a500155ef5d4c51717c028)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15719: Silence warning in C4/Language.pm during web install
Mark Tompsett [Mon, 1 Feb 2016 23:12:44 +0000 (18:12 -0500)]
Bug 15719: Silence warning in C4/Language.pm during web install

This problem was discovered the hard way:
- Drop DB
- Create DB
- Webinstaller run until the screen is:
We are ready to do some basic configuration.
Please install basic configuration settings to continue the installation.
-- The error log file will end with an error about splitting
   an uninitialized value.

TEST PLAN
---------
0) First patch already applied
1) prove -v t/Languages.t
   -- success, but warn prints
2) Apply this patch
3) prove -v t/Languages.t
   -- success without warning messages
4) run koha qa test tools

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as described. QA test tools run OK

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit a84264c92f4c34607fba09f109610e40611078a9)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 9449b27198a1f8f24dde0675fe6230cb977c4cf0)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15719: Silence warning in C4/Language.pm during web install - tests
Mark Tompsett [Mon, 1 Feb 2016 23:26:41 +0000 (18:26 -0500)]
Bug 15719: Silence warning in C4/Language.pm during web install - tests

Test empty database case.

TEST PLAN
---------
1) prove -v t/Languages.t
   -- success (because test case is missing)
2) Apply this patch
3) prove -v t/Languages.t
   -- success, but warning printed.
4) run koha qa test tools

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised. QA test tools rus OK

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 701f427587daa4530041014fae8bf3674351283c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 9719f0280141f0770f2eb8cdb96c4a8ccffcf253)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15699 [QA followup] - Only display firstname if present
Nick Clemens [Mon, 1 Feb 2016 15:57:56 +0000 (15:57 +0000)]
Bug 15699 [QA followup] - Only display firstname if present

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit ad63a6b8da1cd91f2e03ec4093d76b00cd3045d2)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit fa632a7a205fa89eb45388265b5bce42125caf1e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15699 - Course reserves instructors should be in form "Surname, Firstname" for...
Nick Clemens [Thu, 28 Jan 2016 21:58:37 +0000 (21:58 +0000)]
Bug 15699 - Course reserves instructors should be in form "Surname, Firstname" for sorting purposes

This patch changes the order of the name fields and adds a span class around
each in case of library wanting to customize further

To test:
1 - Enable course reserves
2 - Add some courses with instrcutors
3 - Note they are of form "Firstname Surname"
4 - Apply patch
5 - Note the change
6 - Note span tags
7 - Note you can hide firstname by adding to intranet user js: $(".instr_firstname, instr_separator").hide();

Sing-off note: This patch displays the names as advertised on cgi-bin/koha/opac-course-reserves.pl Sorting
the names would need some more actions but seems not to be intended by this patch.
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 4dba088549d1add43cfd575ebdd3d21689c4a700)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit f232ce8bdc54f9b2e244da2290888ac2454cee8b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15667 RMaint followup
Frédéric Demians [Tue, 15 Mar 2016 08:36:46 +0000 (09:36 +0100)]
Bug 15667 RMaint followup

8 years agoBug 15667: Fix date and branch formatting of messages in patron account display
Marc Véron [Tue, 26 Jan 2016 15:33:49 +0000 (16:33 +0100)]
Bug 15667: Fix date and branch formatting of messages in patron account display

This patch fixes the date and branch formatting of messages in patron
account display.

To verify:
Add a new message to a patron account from the 'checkouts' tab in staff,
the displayed date is not correctly formatted and the branch displays as code
instead as branch name

To test:
Apply patch, verify that the messages and branch names are properly formatted.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as described. The message dates in checkouts tab follow dateformat sypref

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 015e20138a7a400d0da30b0a771a94eede673c05)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 1f5305d264eb8df62c93f16f4462ebe63640c568)

8 years agoBug 15658: Browse system logs: Add more actions to action filter list
Marc Véron [Mon, 25 Jan 2016 17:58:54 +0000 (18:58 +0100)]
Bug 15658: Browse system logs: Add more actions to action filter list

The following actions were missing in the action filter list on
cgi-bin/koha/tools/viewlog.pl:

'ADDCIRCMESSAGE'
'CHANGE PASS'
'DELCIRCMESSAGE'
'RENEW'
'Run'

To test:
- Apply patch
- Go to Tools > Logs (viewlog.pl)
- Verify that the actions appear in the list 'Actions'
- Verify that the new entries filter the list as appropriate (in
  combination with Modules: All or with a meaningful selection in
  list 'Modules')

Note for testing: You have to set a date in 'Display from' to get results

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Logs work as advertised, translated in bug 13474

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
"Run" could be more explicit.

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 7ce721ebefc13d99ff527fad26b39b7064bd2e11)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 7ee61481663ed83f11055b52cc40b0b55bf7a40f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 13474: Adding untranslatable log actions to viewlog.tt
Aleisha [Tue, 19 Jan 2016 20:29:24 +0000 (20:29 +0000)]
Bug 13474: Adding untranslatable log actions to viewlog.tt

Added 'Run'

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
(Amended to remove tab chars to make qa tools happy)
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 4c87b50ac32a00fd1056ab3923ecb11bde5c2b51)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 955c2456846588fec32644930be3aa84c5bb9fad)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15881 - Serials new numbering pattern link should be a toolbar button
Owen Leonard [Mon, 22 Feb 2016 18:21:28 +0000 (13:21 -0500)]
Bug 15881 - Serials new numbering pattern link should be a toolbar button

This patch converts the "new numbering pattern" link to a
Bootstrap-styled toolbar button for consistency with other pages in
Koha. This patch also includes minor markup corrections:

- Standardizing on the phrase "Numbering patterns" by eliminating the
  occasional use of "number patterns."
- Removing mistaking closing slash on <select>
- Using standard "Cancel" link instead of a button.
- Adding a colon and space after labels.
- Fixing of "no existing patterns" message.

To test, apply the patch and go to Serials -> Numbering patterns

- Confirm that the "New numbering pattern" button looks correct and
  works correctly.
- Confirm that the entry form looks correct and that the cancel link
  works as expected.

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 0058a977c6b76e0602708ca48fabdbc679b9e0ab)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 54d3ee5758b2fc646aa4c403afa8754772cf9c2e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15880 - Serials new frequency link should be a toolbar button
Owen Leonard [Mon, 22 Feb 2016 18:09:00 +0000 (13:09 -0500)]
Bug 15880 - Serials new frequency link should be a toolbar button

This patch converts the "new frequency" link to a Bootstrap-style
toolbar button in order to maintain consistency. Also included in this
patch are some other minor markup corrections:

- A colon and space after labels
- A 'Cancel' link instead of a button.
- "Required" classes for a required field.

To test, apply the patch and go to Serials -> Manage frequencies.

- Test the "New frequency" button
- Confirm that the changes to the entry form look correct.

Followed test plan, displays 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 3b838ac251a145be2cfa46a076f1e786a86c2f16)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 3b15abed9bf6a6bb528b4f9580fbaaf14638156e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15833: item.biblioitemnumber returns a biblioitem DBIx::Class object
Jonathan Druart [Tue, 16 Feb 2016 15:58:44 +0000 (15:58 +0000)]
Bug 15833: item.biblioitemnumber returns a biblioitem DBIx::Class object

2 links are wrong on the renew page, because item.biblioitemnumber does
not return the biblioitemnumber as expect the template.

Test plan:
Renew an item and check the item link.
It should contain a valid biblioitemnumber for the 'bi' parameter.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Link repaired. At first glance, I am wondering if biblioitemnumber is
of actual use here; is it only passed back and forth between script and
template?

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 1302f91755012d9d31e87b037cb882bc025b357f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit e3394929749f5e8ae2c764a3f23920ec347b871f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15790 - Don't delete a MARC framework if existing records use that framework
Owen Leonard [Thu, 11 Feb 2016 17:06:39 +0000 (12:06 -0500)]
Bug 15790 - Don't delete a MARC framework if existing records use that framework

If a MARC framework is in use by any records it should not be possible
to delete it. Deleting a framework which is in use will leave the
deleted framework code in those records.

This patch modifies the deletion confirmation dialog so that it will not
let the user confirm the deletion if there are records using it.

To test, apply the patch and go to Administration -> MARC frameworks

1. Try to delete a framework which is in use by 1 or more records. The
   resulting confirmation dialog should prevent you from proceeding.
2. Try to delete a framework which is not in use. Test both canceling
   and confirming that deletion to make both function correctly.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 18820b6c8fc30fb25c99e0e0710d08eda2bc745c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15691: Show card number minimum and maximum in visible hint when adding a patron
Owen Leonard [Thu, 28 Jan 2016 13:54:56 +0000 (08:54 -0500)]
Bug 15691: Show card number minimum and maximum in visible hint when adding a patron

The CardnumberLength system preference defines card number minimum and
maximum allowed values when adding a patron. This information is
currently hidden in a title attribute on the card number input field.

This patch moves the information into a <div class="hint">, matching
other fields in the entry form which offer details about entry
guidelines.

To test, apply the patch and open the new patron entry form. Test for
various values of CardnumberLength, and with 'cardnumber' mandatory or
not mandatory as defined in BorrowerMandatoryField.

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 Gallagher brendan@bywatersolutions.com
(cherry picked from commit 9f172a3c1bc8c7cd1664eabac81c5b66877b3952)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 276b59e5bcce0f68dfbce32f2c94e8d5178500a7)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15674: Make "Column visibility" translatable
Jonathan Druart [Mon, 29 Feb 2016 07:32:14 +0000 (07:32 +0000)]
Bug 15674: Make "Column visibility" translatable

The "Column visibility" text button was not translatable, now it is.

Test plan:
1/ Update the template for a given language and translate the "Column
visibility" string
2/ Go on admin/currency.pl
=> The string should be translated.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 2c186dd5a00cf8cb18fb596957a5ddfa9559bc42)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15605: Remove the cursor:pointer style.
Jonathan Druart [Wed, 27 Jan 2016 10:33:24 +0000 (10:33 +0000)]
Bug 15605: Remove the cursor:pointer style.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit effe1e27819a3b7d156e4abf5c96dd34d529246f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 8d58579d6b5a4a287c3283284a2c4b8618ec763b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15605 - Accessibility: Can't tab to add link in serials routing list add user...
Natasha [Wed, 20 Jan 2016 02:11:37 +0000 (02:11 +0000)]
Bug 15605 - Accessibility: Can't tab to add link in serials routing list add user popup

To Test -
1. Go to Serials and search for a title and then click on it.
2. Click routing list and then Add recipients.
3. Search for a patron.
4. Using the tab key try to navigate onto the Add link.
5. Notice it skips Add.
6. Apply the patch and then repeat steps 1-4, notice the Add link can now be accessed through using the keyboard.

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 c76549dd7b4a090844a5a51664409417f9838923)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit da966cef92701e9d2469be784cc773d815769ffe)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 14244: Does not display patron's info in the checkout history if not authorised
Jonathan Druart [Mon, 25 Jan 2016 10:31:34 +0000 (10:31 +0000)]
Bug 14244: Does not display patron's info in the checkout history if not authorised

The librarian needs CAN_user_circulate_circulate_remaining_permissions
to see the checkouts patron's information.

Test plan:
The "Patron" column of the checkout history page should only be
displayed of you have the circulate > circulate_remaining_permissions
permission.

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 818b1871519f0348cc54a60c76e2c8192f36bb3c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit fd65d2264e830c1a41e2cbfbe94049ca7d1eddda)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 14244: viewing a bib item's circ history requires circulation permissions
Thomas Misilo [Wed, 16 Sep 2015 17:43:28 +0000 (13:43 -0400)]
Bug 14244: viewing a bib item's circ history requires circulation permissions

On issuehistory.pl you have:

 flagsrequired   => { circulate => "circulate_remaining_permissions" },

But that really doesn't make sense. People should be able to view the history of circulation without having permission to circulate items themselves

This patch changes the required permissions from circulate to catalogue.

Test Plan:
1. Login as user without the circulate_remaining_permissions
2. Attempt to view Circulation History of an Item
3. Does not work
4. Apply Patch
5. Attempt to view circulation history with a user that has access to the staff side.
6. Can view circulation history now

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
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 e8c5fb11fbebc86742325aea745bc7253d9110d8)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit a835060b9c10272fccf5262f5c77cc9d0031de7f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15736 DB rev 3.20.09.001
Frédéric Demians [Tue, 15 Mar 2016 06:53:59 +0000 (07:53 +0100)]
Bug 15736 DB rev 3.20.09.001

8 years agoBug 15736 [QA Followup] - Make add more details to the syspref description
Kyle M Hall [Sun, 14 Feb 2016 14:12:50 +0000 (14:12 +0000)]
Bug 15736 [QA Followup] - Make add more details to the syspref description

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit f92ef6207bc7346825f097f61e696b4b3685a737)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 59d2298865fee7abb91b24833b4bff2f627bbcd6)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15736: Add ShowAllCheckins pref to control the display of checked-in item list...
Jonathan Druart [Fri, 12 Feb 2016 09:07:09 +0000 (09:07 +0000)]
Bug 15736: Add ShowAllCheckins pref to control the display of checked-in item list on checking

Bug 14821 removed the items which were not checked out, but some
libraries considered it as a bug.
So let's add a new pref to control this behavior.

Test plan:
0/ Execute the updatedb entry and set ShowAllCheckins to "Do not show"
(default)
1/ Check an item in.
If the item was not checked out, it won't be listed
2/ Turn the pref to "Show"
3/ Check an item in
If the item was not checked out, it should be listed

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit ce6c3bb88b426b0d0b945b9e71c695017dcb0fed)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 21ebaf949e0d3822e313ff76a32c23a97be0a78e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15998 - svc/holds: use holdingbranch instead of holding_branch
Julian Maurice [Mon, 7 Mar 2016 15:19:12 +0000 (16:19 +0100)]
Bug 15998 - svc/holds: use holdingbranch instead of holding_branch

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
8 years agoVersion 3.20.9 v3.20.09
Frédéric Demians [Tue, 1 Mar 2016 17:05:08 +0000 (18:05 +0100)]
Version 3.20.9

8 years agoTranslations for 3.20.9
Frédéric Demians [Tue, 1 Mar 2016 16:59:56 +0000 (17:59 +0100)]
Translations for 3.20.9

8 years agoBug 15795: C4/Members.pm is floody (Norwegian Patron DB)
Mark Tompsett [Thu, 11 Feb 2016 02:51:26 +0000 (21:51 -0500)]
Bug 15795: C4/Members.pm is floody (Norwegian Patron DB)

From the mailing list:
"I'm working on 3.22.02 and my logs are FILLED with the following warnings:

Members.pm: Unable to load Koha::NorwegianPatronDB at /blurred/C4/Members.pm line 46., referer: http://blurred/cgi-bin/koha/acqui/booksellers.pl
admin-home.pl: Unable to load Koha::NorwegianPatronDB at /blurred/C4/Members.pm line 46., referer: http://blurred/cgi-bin/koha/admin/preferences.pl"

I agree. Looking at C4/Members.pm other warns are all prepended with $debug.

TEST PLAN
---------
1) rm Koha/NorwegianPatronDB.pm
   -- quickest and dirtiest way to get the load to fail.
2) echo > ~/koha-dev/var/log/koha-error_log
   -- so it will be easy to spot the log changes.
   -- back up the log file if you really want it.
3) log into the staff client and go to patrons.
   -- Check the log file. "Unable to load ..." will be there.
4) echo > ~/koha-dev/var/log/koha-error_log
5) sudo vi /etc/apache2/sites-enabled/{your koha site file}
   -- Find your staff client entry in your apache
      configuration file and add:
       SetEnv DEBUG 1
6) sudo service apache2 restart
7) apply the patch
8) refresh the patron page
   -- "Unable to load..." will still be there.
9) change the DEBUG value in your apache config to 0
10) sudo sevice apache2 restart
11) echo > ~/koha-dev/var/log/koha-error_log
12) refresh the patron page
    -- "Unable to load..." will NOT be there.
13) git checkout origin/master -- Koha/NorwegianPatronDB.pm
    -- to bring it back.
14) refresh the patron page
    -- "Unable to load..." will still not be there.
15) run koha qa test tools

Signed-off-by: Philippe Blouin <philippe.blouin@inlibro.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit b52cbecbfd282060a2a444252d83d263c0783f14)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 410b567a4c7943b052cfeee04fbd3fd986bbecd6)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15622 - Spelling mistake in printfeercpt.pl writen -> written
Gus [Wed, 20 Jan 2016 02:50:13 +0000 (02:50 +0000)]
Bug 15622 - Spelling mistake in printfeercpt.pl writen -> written

Search the file for writen, when not found change sucsessful

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit fdd66bc830e8974be67ca43379e4ae3156b0e9cb)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 71e8855f1e0e7e593141061e84b6355b7f09608c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15416: Warns on guided_reports.pl
Aleisha [Mon, 18 Jan 2016 03:30:44 +0000 (03:30 +0000)]
Bug 15416: Warns on guided_reports.pl

Initialising $phase variable to be '' if not defined.

To test:
1) Go to Reports -> Guided Reports Wizard
2) Notice warns
3) Apply patch
4) Refresh page
5) Confirm warns are gone and page still works as it should

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Warns are gone. Page still works as expected

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch:
-my $phase = $input->param('phase');
-$phase //= '';
+my $phase = $input->param('phase') // '';

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 17c7c685f12dd09186d369f84cc725984328c5fa)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit fef0f0c367328b1f4ca22b9124783b12706d176e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15743: Allow plugins to embed Perl modules
Julian Maurice [Thu, 4 Feb 2016 16:42:42 +0000 (17:42 +0100)]
Bug 15743: Allow plugins to embed Perl modules

This patch allows plugins to embed Perl modules by ignoring Perl modules
in plugins directory that don't inherit from Koha::Plugins::Base

TEST PLAN
---------
1) Edit koha-conf.xml to have enable_plugins set to 1, and
   the pluginsdir set to a particular path.
2) Create a dummy plugin file. (e.g. {that path}/Koha/Plugin/Kaboom.pm)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 2a43195322c228795b08ebbc165e360c725c2b56)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 5f96cbd933aad1bade1d06b57e58c205aa6ffa35)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15652: Allow current date in datepicker on opac-reserve
Marcel de Rooy [Mon, 25 Jan 2016 12:14:56 +0000 (13:14 +0100)]
Bug 15652: Allow current date in datepicker on opac-reserve

If you enable AllowHoldDateInFuture (and its OPAC variant), you get
an additional "Hold starts on date". In that field and in "Hold not
needed after" it was not possible to enter the current date.

Although it does not really make any difference if you leave the startdate
empty or put the current date in it, we concluded that it still makes
a psychological difference. Some patrons were confused when placing a
hold because the first date to select was tomorrow. Instead of telling
them "Yes, but you can leave it empty", we should just allow the current
date as well.

The expiration date ("not needed after") also started on tomorrow. (This
field can really be empty.) But there is actually no reason not to allow
today here too. If the patron only wants it today, why force tomorrow?

How is this arranged? Well, this is one of the simplest Koha patches ever
written. It only changes the minDate option of both date pickers in one
line from 1 to 0.

Test plan:
[1] Allow future hold dates via systempreferences.
[2] Verify that you can enter today in both fields.
[3] Put today in start and expiration date. Place the hold and verify that
    you can confirm the hold, check out and check in again.

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 Gallagher brendan@bywatersolutions.com
(cherry picked from commit 904a358da38e2945125170c3e9896193f0c288ce)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit ae2c66c601a38a30d7ed8e8a074dbb0282de6057)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 11937 - opac link doesn't open in new window
Juan Romay Sieira [Tue, 9 Feb 2016 16:39:32 +0000 (17:39 +0100)]
Bug 11937 - opac link doesn't open in new window

Signed-off-by: Juan Romay Sieira <juan.sieira@xercode.es>
Patch works as expected. From a biblio detail page, the link
'OPAC view: Open in new window' opens a new browser window.
Signed-off-by: Marc Veron <veron@veron.ch>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit d1ead7313cf78581e31c4a210f01709ff228fdb6)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit e6cab05555d775d3303deffb9016d03b1753ef6a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15746: Same fix for "write off"
Jonathan Druart [Fri, 5 Feb 2016 10:58:20 +0000 (10:58 +0000)]
Bug 15746: Same fix for "write off"

Same fix as before for the "Write off" button next to the "Pay" button.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit efad45a0e39703017a894d3ffdd1a7078d13af60)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 9973f0e986abf1db68dc177369f85126f77230d2)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15746: Do not record individual payments with randomly picked libraries
Jonathan Druart [Fri, 5 Feb 2016 10:46:28 +0000 (10:46 +0000)]
Bug 15746: Do not record individual payments with randomly picked libraries

When a payment is made individualy, the library used to record this
payment is randomly picked from the library list.
This is because C4::Branch::GetBranch looks at 1. the $branch variable
sent by the template, wich does not exist, then 2. the branchname
cookie, which does not exist neither, then 3. get the first branchcode
from a list of keys (non ordered).

To reproduce:
- Create a manual invoice for a patron
(members/maninvoice.pl?borrowernumber=XXXX)
- Pay this fine using the "Pay" button of the corresponding line from
  the members/pay.pl?borrowernumber=XXXX page
Look at the statistics table:
select * from statistics order by datetime desc limit 10;

The branch value of the first line might not correspond to the library
you were using to pay the payment.

Test plan:
Apply this patch, repeat the steps above and confirm that the library
picked is now the one used to pay.

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 Gallagher brendan@bywatersolutions.com
(cherry picked from commit 80a690588ceac464891dcb2956c3b148433a253c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit f2c6d5ad4f042ddcbf7127bc5d440cd8032cc8f4)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15742 [QA Followup] - Tidy script
Kyle M Hall [Thu, 4 Feb 2016 21:24:53 +0000 (21:24 +0000)]
Bug 15742 [QA Followup] - Tidy script

Script does not appear to have any other modifying patches at this
time based on bz splitter. This is a perfect time to clean up this
script!

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 0277c545b0369046e3d2785689ea52b99d84962f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 63230f6bfea8c36246793eaf13791e8a3883af6b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15742: Remove unnecessary loop in j2a cronjob
Jonathan Druart [Thu, 4 Feb 2016 13:25:14 +0000 (13:25 +0000)]
Bug 15742: Remove unnecessary loop in j2a cronjob

If no branchcode is given, all the libraries are retrieved and the same
query (so without using the libraries loop) is executed for each
library.

Test plan:
Use the j2a.pl cronjob to change the category of a child patron
If a branchcode is passed to the script, only the children from this
branchcode should be updated.
But if it is not passed, all children of the DB should be updated.

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 cf047247893b04de820ff51e9b2d8f43773af332)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 93c5535eb5498887052d5c44d661b99b3f550461)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15517 Fix test for 3.20
Frédéric Demians [Tue, 1 Mar 2016 14:02:18 +0000 (15:02 +0100)]
Bug 15517 Fix test for 3.20

8 years agoBug 15517: Update DB rev (3.20.08.004)
Brendan Gallagher [Tue, 23 Feb 2016 23:13:08 +0000 (23:13 +0000)]
Bug 15517: Update DB rev (3.20.08.004)

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit e06c67044e11ffd9defc20af81d78422ff97a775)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 9329290fc5f930d2950c27a4f65d7b08acb3d7ec)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 3a64f9c8470b9ae672e7f9ec0baf9d5ee4dd0b5f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 17556074415305b47905288773a2d7d71a9ef8cd)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit c8a0323e7b9ee4c736d38f31c8954162ee19c4e5)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 70ec608f917664411c6fc3357ade58a6261dd86f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 619060799d5b89c22fe83dfecc229b84a638b0da)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 46d7a7d2c6fdbd12851777ffd72c2f5175352e07)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit f02054cfcd37a6bd41e563cc7a4f50d6c65145ec)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 94e6b71b4e35d852110537a6dcf00fc1ea3f3546)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit cd5640eb9f8835862d695a2572ad9017b771c13c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit ae839dbfe4d49f10ee1b93958fd516d7971bf51c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 7876820211d44624bf65aa70b177555d53206353)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 13534: Update DB rev (3.20.08.003)
Brendan Gallagher [Tue, 23 Feb 2016 15:33:41 +0000 (15:33 +0000)]
Bug 13534: Update DB rev (3.20.08.003)

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 9ad830d04b88e16c44824f3fd1052dd566df3345)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 71b0885babf336843d931afd09233428f6f8f86d)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit d7587e0567ac97639e84be668a08d5e6985e3e87)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 6ce3969d07c5dc55f898d74be9bab41e262314ee)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit b3b03440f37885cdb4b0d7fe1b49c17cd41a72df)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 7fd9119cd8c8dfdbbef4e05cbae55209e07368a2)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15411: Update DB rev (3.20.08.002)
Jesse Weaver [Fri, 12 Feb 2016 19:43:32 +0000 (12:43 -0700)]
Bug 15411: Update DB rev (3.20.08.002)

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit af61bfbcf827fc51e2f27f45afce9bec349a0bb4)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 3b1e74d7ae5e4f2f2c36a982abdea594ae457117)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit ec9fd6c43f01258d9c26a47d8b8697c62c6887bd)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit cd0b768bd0f9fe7fa373f72d74bc20357695bdf5)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 9c1c9285a84d9341432188258ea56ab5e88a434b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit e78c5cfb4e8192262f807142a5c74c8ed502bcd3)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 59229f74805c9bdc817b0c5f65b311f9825ce3b3)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit f861cf879b5a4e65482ba607e80a0b4a8373fc7e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 6eb380da3b8908b7a909828082fe95f6d221fe19)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 11569: Update DB rev (3.20.08.001)
Julian Maurice [Mon, 1 Feb 2016 16:55:15 +0000 (17:55 +0100)]
Bug 11569: Update DB rev (3.20.08.001)

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 53bbfa2aab5daf148113de1929193b64f3cf19ef)

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>
(cherry picked from commit 8635b7b6dc97aa9f329d9f9d0b5ddb2245cc9bba)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit f9978afb60aa845de07fa0c31e1b35b208a8cabb)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit af24e8ee01877928335727bf04248b3c372ac574)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 15760 RMaint Avoid SQL injections
Frédéric Demians [Fri, 12 Feb 2016 11:23:22 +0000 (12:23 +0100)]
Bug 15760 RMaint Avoid SQL injections

For security purpose, backport a fix to the way the DB connection is
established.

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>
(cherry picked from commit be7ca57e113d7ba27b86e93ad3ce05e64921b5db)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 76326a09818cd6af8a07f427e56b17ff4c9220d5)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit daaf3c758c9ba6e642083f4e198b8ad451444c3f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 7db70b33a4dedd6d1de321a49f4e4be33fd17293)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 6cb7dc0c0a06839892bcba9172a1603793481f90)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit d26086a84c9909dcc96d4f35086f4028a3e4c8bd)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit db2a954579499d8f21670c157ee50959fe50143e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 73bf2f2dc83974a9d33c7b02078697a84111def3)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit dceb3ed02284270af12b711014d30555115403f8)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 4f976932a489f347becd5eb7f27952dcda35fa3d)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit ac36fe478adeb8d0565ca1538db25a57b60380cd)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit d5dd89ff78f733be327f258ed1b8be16e3d030ef)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit e23abce8ddd275505caeaaef058e8a90bf61495a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 45095c007839fb4cd46e52e2b3188d9d2b50ebda)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 644e69cb7fa3aac68abe610b7b59045dc92d8d29)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 8013976d3e00eb3c9ae3370aaa925e0c29048e06)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 314f1f7a2f116bc6a18fe2f14883f5e3bf2a3760)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 6c1b8ddffee6f9c414a14e02b10b428b04eb5e5e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 74680de7361c31ae87ca35d3e4a6347b05747067)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit 0e6346c614bd5707d79fc376dd4d9028c5086bc9)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit c08a13593cbc3a60ac3d5345c93c6c4c362a3835)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
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>
(cherry picked from commit d259eaac7ba240cbe9008271d9d123a5758547d8)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>