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>
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>
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>
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>
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>
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>
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>
Galen Charlton [Tue, 1 Mar 2016 13:51:56 +0000 (13:51 +0000)]
Bug 15947: move SIPILS.t to DB-dependent test directory
SIPILS.t requires an active koha-conf.xml to pass,
and consequently is moved to t/db_dependent so that
'make test' can succeed.
To test
-------
[1] Unset KOHA_CONF and either do a make test or a
prove -v t/SIPILS.t. Note that the tests fail.
[2] Apply the patch and run make test again; this time,
the test suite should pass.
[3] Verify that with KOHA_CONF *set*,
prove -v t/db_dependent/SIPILS.t passes.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit ffda0166cf184c9b2e38d3652700f00a89484e80) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Tue, 1 Mar 2016 10:52:39 +0000 (10:52 +0000)]
Bug 15939: Action logs - Do not default dates to today
When accessing the modification logs from a link that does not
explicitly set the to and from dates (e.g., from patron or bib details),
no results are displayed unless the object had an action occur during
the current day.
This is a side-effect of commit 5dceb851 for bug 13813.
Test plan:
- View the modification logs of a record which has already been modified
(/tools/viewlog.pl?do_it=1&modules=CATALOGUING&action=MODIFY&object=XXX)
=> Without this patch, you won't see any logs (unless you have modified
the record today)
=> With this patch, the behavior is the same as prior bug 13813 (you can
check in 3.20.x), you will see all logs
Signed-off-by: Galen Charlton <gmcharlt@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit ca36ee3794c7a33976405fe8231df28ecaee3289) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
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>
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>
Jonathan Druart [Mon, 8 Feb 2016 13:00:37 +0000 (13:00 +0000)]
Bug 15755: Display default item type as "All" in circ rules
Bug 15354 did not fix correctly the issue with the item type display.
The default item type '*' should be "All", at the moment nothing is
displayed in the column.
Test plan:
1/ Define a rule for default item types (All/*) and for specific item
types.
2/ Translate some item type descriptions used in previous step
3/ Default item type should be "All" and correct translations should be
displayed.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 6d854a167d2843ac2dac690bb69a048006994372) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
Owen Leonard [Thu, 11 Feb 2016 13:56:42 +0000 (08:56 -0500)]
Bug 15670 - Rename "Cancel" to "Cancel hold" when checking in a waiting item
When checking in an on-hold item which is waiting, the "Cancel" button
cancels the hold, so it should say so. This patch changes the text.
This patch also moves the 'cancel hold' button to the middle, on the
theory that buttons on the left should default to 'confirm' and buttons
on the right should generally imply 'cancel'--as in 'do nothing.' Moving
it to the middle seems like a good place to put it where users will have
to think about clicking it.
To test:
1. Find an hold which has been made 'waiting,' or check in an confirm a
pending hold at your library.
2. Check in that item again and verify that the 'Hold found' dialog
contains a 'Cancel hold' button which works to cancel the waiting
hold.
3. Repeat the process and confirm that the functionality of the other
buttons is unchanged.
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 Gallagher brendan@bywatersolutions.com
(cherry picked from commit d9dc8be41780c3a4332f2fd50f80961d1653c49e) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
In this patch I have fixed the 'Remove selected items' button.
I have also added a 'Delete batch' button like there is in the Patron Card Creator.
To test:
1) Go to Tools -> Label creator -> New label batch
2) Add 2 items
3) Select the checkbox next to an item you just added and click 'Remove selected items'
4) A pop-up will say that you are yet to select an item. (Please ignore the mistake in the pop-up message, this is being fixed in Bug 15662)
5) Apply patch and refresh. Confirm there is now a 'Delete batch' button in the toolbar
6) Select one item and click 'Remove selected items'
7) Confirm the item is deleted from the batch
8) Select the final item and click 'Remove selected items'
9) Pop-up message will tell you that deleting this item will delete the batch. Click 'Okay'
10) Click 'Delete batch' then 'Okay'
11) Confirm you are redirected to the Labels page and the batch has been deleted.
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 4bf881d32c41b54357949e4d37b1401b1324bc8e) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
Jonathan Druart [Thu, 7 Jan 2016 12:34:54 +0000 (12:34 +0000)]
Bug 15306: Do not display the translate link if only 1 language is installed
It doesn't make sense to offer the option to translate an item type
description into another language if there is only one language
installed.
Test plan:
Generates templates for only 1 language
Edit an item type and confirm that the link "translate into..." is not
displayed.
Generates templates for another language
Confirm that the link is now displayed.
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 adef1d1020255373ec6f954bcd1a02e382305047) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
Jonathan Druart [Mon, 29 Feb 2016 08:10:59 +0000 (08:10 +0000)]
Bug 15923: Take the id list file into account when exporting records
When exporting records (tools/export.pl or misc/export_records.pl), a
file of ids (authid or biblionumber) can be passed to filter the
results.
Bug 14722 has broken this behavior.
Test plan:
Export records and specify a list of records to filter the results.
Prior to this patch, the record with the id 1 was exported.
Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 24e502e4a9151cda71bac2e58ddd0f6a02c4ec2e) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
Julian Maurice [Sat, 27 Feb 2016 17:26:08 +0000 (18:26 +0100)]
Fix an error in fr-CA-opac-bootstrap.po
msgfmt failure
misc/translator/po/fr-CA-opac-bootstrap.po:2206: 'msgstr' is not a valid
C format string, unlike 'msgid'. Reason: In the directive number 1, the
character 'M' is not a valid conversion specifier.
msgfmt: found 1 fatal error
1639 translated messages, 3 fuzzy translations.
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marcel de Rooy [Wed, 17 Feb 2016 15:32:03 +0000 (16:32 +0100)]
Bug 15845: Renewal date in circulation.pl is not always correct and not even used
If you have a patron category with a hard renewal date, the enrolllment
period will be zero. You cannot calculate the renewal date as is done
in the script currently.
Even more, the renewaldate template var is not even used.
Test plan:
[1] Verify that checkin/checkout works as expected.
[2] Git grep on renewaldate
[3] Check the code in circulation.pl for "$renew"
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 393308907ca332339d1be05ee99463dc783126d4) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Colin Campbell [Wed, 17 Feb 2016 12:47:56 +0000 (12:47 +0000)]
Bug 15841 Circulation module's true value misplaced
1; was not at the end of the module as it should be
to ensure compilation returns true
return it to last line of code where it should be
This patch fixes an ovious mistake. 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 5170c91f493aaa82d111a6a5215faf0ed53be72b) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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
Owen Leonard [Wed, 17 Feb 2016 17:17:17 +0000 (12:17 -0500)]
Bug 15847: Correct JSHint errors in basket.js in the staff client
This patch corrects minor errors in the staff client's basket.js
according to warnings raised by JSHint.
To test, apply the patch and run JSHint on basket.js. No warnings
should be raised.
To confirm that the behavior of the JS is not changed, clear your
browser cache if necessary and:
- Test adding multiple titles to the Cart from staff client search
results.
- Confirm that adding titles to the Cart triggers a message by the Cart
link.
- Test clicking the "Cart" link in the header menu when the Cart popup
is open but behind the main window.
- Testing emptying the Cart.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as described. No warnigns raised with jshint tool
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 2374c0498544803693bf0d833ad982174e21ed73) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Owen Leonard [Wed, 17 Feb 2016 14:54:28 +0000 (09:54 -0500)]
Bug 15844 - Correct JSHint errors in staff-global.js
This patch corrects minor errors in staff-global.js according to
warnings raised by JSHint.
To test, apply the patch and run JSHint on staff-global.js. No warnings
should be raised.
To confirm that the behavior of the JS is not changed, clear your
browser cache if necessary and:
- Confirm that the "Help" link opens the help window.
- Confirm that audio alerts work with local and remote sound files
- Confirm that the format() method is still working correctly by, for
instance, opening the detail page for a bibliographic record with
multiple items and choosing 'Edit -> Delete record' from the menu. The
error message should read like "2 item(s) are attached to this
record..."
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as described. No errors with JSHint CLI (6 errors fixed)
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 9a7c6f695c4dd0fe5a1a92534ad0af79adbf1122) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Fri, 12 Feb 2016 15:26:49 +0000 (15:26 +0000)]
Bug 15811: follow-up Bug 4912: Redirect to the appropriate view after editing/deleting a list
Test plan:
1/ At the opac, go on the the list home page (opac-shelves.pl)
2/ Click on 'new list', create a list and save
=> You should be redirect to the list
3/ Click on edit, save
=> You should be redirect to the list
4/ Delete the list
=> You should be redirect to the list
5/ Edit a list from the list view, save
=> You should be redirect to the list
6/ Click on a list link (op=view)
7/ Edit the list, save
=> You should be redirect to the 'show' view
8/ Delete list
=> You should be redirect to the list
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 d9b39d2553271814527de58be23da6d8f28e0f78) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Mark Tompsett [Fri, 12 Feb 2016 04:30:36 +0000 (23:30 -0500)]
Bug 15777 - Refactor and fix the RecordProcessor class
TEST PLAN
---------
1) Apply all three patches
2) prove -v t/RecordProcessor.t
-- all should be successful
3) run koha qa test tools
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 0195a2af99d9e7cd15e39e5cb08d9be4b0ea1759) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Mark Tompsett [Fri, 12 Feb 2016 04:23:27 +0000 (23:23 -0500)]
Bug 15777 - Fix base class to prove refactor and fix required
TEST PLAN
---------
1) Apply the testing patch and this patch
2) prove -v t/RecordProcess.t
-- will complain about string use with "use strict".
This is because it is using the module name, instead
of the object instantiated with new().
3) run koha qa test tools.
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 84ca3db6c70c8e7dc3e568c6cdee7cdadd3bd85a) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Mark Tompsett [Wed, 10 Feb 2016 16:18:40 +0000 (11:18 -0500)]
Bug 15777 - Test to prove initialization isn't working correctly.
TEST PLAN
---------
1) Apply this testing patch
2) prove -v t/RecordProcessor.t
-- tests will fail.
3) run koha qa test tools
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 3b875d3a2f57557d31a569a8d9a6aadc45e86f84) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Fri, 12 Feb 2016 11:47:22 +0000 (11:47 +0000)]
Bug 15747: Do not use CGI->param in list context - Auth.pm
Test plan:
Log you in!
Without this patch applied, you will get a warning
"Fetching the value or values of a single named parameter"
With this patch applied, the warning from C4::Auth line 401 should not
appear anymore in the log file.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Note: no warnings for older CGI versions.
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit d9c19c6d45ad3f62119e3a29f37e227f635cb85c) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
Owen Leonard [Thu, 18 Feb 2016 15:06:41 +0000 (10:06 -0500)]
Bug 15600: System preferences broken toolbar looks broken
This patch reverts some deletions made to staff-global.css in Bug 11559.
The deletions broke the appearance of the floating toolbar in system
preferences.
To test, apply the patch and clear your browser cache if necessary.
- Go to Administration -> System preferences and view a tab with enough
content to allow you to scroll and test the appearance of the floating
toolbar. Confirm that it looks correct.
- Open the advanced cataloging editor and confirm that its toolbar looks
correct.
- Open the normal cataloging editor and confirm that the floating
toolbar looks correct and works correctly.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised. Tollbar looks correct
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 5bbeab483ebc4016fe2c1503b95b8bf84e719c54) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
Julian Maurice [Tue, 9 Feb 2016 10:16:55 +0000 (11:16 +0100)]
Bug 15764: Fix timestamp sent by KOCT
KOCT plugin send UTC timestamp, it should be converted to local timezone
Test plan:
1. Install latest version of KOCT and configure it
https://addons.mozilla.org/fr/firefox/addon/koct/
https://wiki.koha-community.org/wiki/Offline_circulation_firefox_plugin
2. Use it to do a checkout and a checkin. See that timestamps are UTC.
3. Click on "Commit to Koha" under "Log" tab
4. Wait for all operations to be processed
5. In Koha, go to Circulation > Offline circulation and check the
timestamps were correctly converted to the Koha server's timezone
6. Process the pending operations and see that timestamps are still
correct
7. Repeat step 2
8. Now click on "Apply directly"
9. Check the timestamps are correct in Koha
NOTE: I could not get "Commit to Koha" to work for me, but I did
confirm this corrected behaviour with "Apply directly".
Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Using the "commit to Koha" option works fine for me.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This patch only affects service.pl, which is not used in any way by the
uploader for desktop client files. No changes to the desktop offline
circ will be needed.
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 0987165d6aab0951259b2101c2133ae4c221357b) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
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>
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>
Jesse Weaver [Wed, 27 Jan 2016 23:39:22 +0000 (16:39 -0700)]
Bug 15514: Fix error with certain repeatable fields in Rancor
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 53a081278d505b76efbd7c08dbe7d45649779740) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
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>
Owen Leonard [Thu, 18 Feb 2016 02:17:10 +0000 (21:17 -0500)]
Bug 15071 - In OPAC search results, "checked out" status should be more visible
The prog template in the OPAC designated a color for the "unavailable"
class associated with items in search results which are checked out.
This class never made it into the Bootstrap theme. This patch adds it to
the Bootstrap theme's LESS file.
To test, apply the patch and search the OPAC for terms that will return
checked out items. In the list of search results, on the "availability"
line, the "Checked out" text should now be red. The change is visible
with XSLT on or off.
Signed-off-by: Nicole C Engard <nengard@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 4270c1443f1a66de2c9ba7f781176c8c3914c88b) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
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>
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>
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>
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>
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>
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>
Jonathan Druart [Fri, 12 Feb 2016 14:33:57 +0000 (14:33 +0000)]
Bug 15810: Make sure the CGI->param is not called in a list context when creating private shelves
This patch fixes the following bug:
If OpacAllowPublicListCreation is set to "not allow", the creation of a
private list raises an error at the OPAC.
CGI->param is called in a list context and some parameters are not
filled from the template if the pref is set to "not allow".
To make sure we don't have a "Odd number of elements in anonymous hash",
we force the context to scalar.
Test plan:
1/ Set OpacAllowPublicListCreation to "not allow"
2/ Create private and public lists at the OPAC and the intranet
=> Everything should work fine with this patch applied
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit d6329e4f96e46a5e2fbe0ced4d385c42d47e2a84) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Lyon3 Team [Tue, 26 Jan 2016 11:40:11 +0000 (12:40 +0100)]
Bug 15643 - Every datepicker on serials expected date column updates top issue
delete 'expected' and 'supexpected' ids that don't seem useful anymore.
Same thing for changeDate2 function
Test plan :
1) Search a serial subscription from the Serials Home page
2)Go to serial collection page and make sure it has a mimimal bunch of
already received or missing issues
3)Check some received issues to be sure to get extra issues (not only
the extected one) in the serial edition page
4) Click on Edit serials button
5) Try to modify whatever date in 'Expected on' column (excepted first
one) using datepicker :
You can see that the top date of the column is updated instead of the
choosen one.
6) Apply patch and redo 1 to 5 steps :
now the right date is updated.
Followed test plan, works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 4c6214f5c943d8c2f12e7cf84c3965ddc4778956) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
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>
Aleisha [Thu, 14 Jan 2016 22:00:41 +0000 (22:00 +0000)]
Bug 15573: String and translatability fix to Patron Card Creator
Fixing the split string
To test:
1) Go to Tools -> Patron Card Creator -> Manage -> Card batches
2) Confirm the table heading reads 'Patron Count'
3) Edit a batch
4) Click Remove duplicates
5) Confirm it reads 'Duplicates removed from batch number X: Y patron(s)'
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as described. Rewording Ok for translatability purpose
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit a3d2de6248386d0efc91c317f2c2e84d936198f6) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Julian Maurice [Wed, 6 Jan 2016 18:11:27 +0000 (19:11 +0100)]
Bug 15358: Fix authorities merge
Bug 8064 (Merge several biblio records) change some code used in both
biblios and authorities merge tool without updating the authorities
merge tool.
This patch fixes that.
Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Thu, 14 Jan 2016 12:27:55 +0000 (12:27 +0000)]
Bug 15578: Make sure all params will be taken into account when instantiating
The tests in t/db_dependent/Koha_Authority.t expects at least 1
authority record in the DB to run them, otherwise they are skipped.
On our integration server, the DB does not contain any records, and the
tests are skipped.
Unfortunately these tests were testing the authid method of
Koha::MetadataRecord::Authority.
Test plan:
Apply the first patch, launch tests
=> Fail
Apply the second patch, launch tests
=> \o/
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
Aleisha [Tue, 22 Dec 2015 21:50:37 +0000 (21:50 +0000)]
Bug 15411: Changing 'Non fiction' to 'Non-fiction'
To test:
1) Apply patch
2) Run updatedatabase.pl
3) Go to advanced search in Staff Client (ie /cgi-bin/koha/catalogue/search.pl)
4) Confirm that it says 'Non-fiction' in the 'Any content' drop-down menu under 'Subtype limits'
5) Go to item search (ie /cgi-bin/koha/catalogue/itemsearch.pl)
6) Confirm that it says 'Non-fiction' under 'Collection code'
7) Go to advanced search in OPAC (ie /cgi-bin/koha/opac-search.pl) and click 'More options'
8) Confirm that it says 'Non-fiction' in the 'Content' drop-down menu
9) Go to the details page for a non-fiction book in the OPAC (ie /cgi-bin/koha/opac-detail.pl?biblionumber=2) and click 'Holdings' tab
10) Confirm that it says 'Non-fiction' under 'Collection' heading
Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit 84e8cafca5e07ad4c2a7cf7129615d20cd9f5ab8) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Thu, 11 Feb 2016 10:16:12 +0000 (10:16 +0000)]
Bug 15760: Avoid SQL injections
Asking on #dbix-class, ribasushi told me to set quote_names to the
connection options.
Indeed it does the fix, globally :)
Test plan:
1/ Add the following snippet to the a script (mainpage.pl is a good candidate)
use Koha::Virtualshelves;
my $s = Koha::Virtualshelves->search({}, { order_by => '1,(select case when (3*2*1=6 AND 000227=000227) then 1 else 1*(select table_name from information_schema.tables)end)=1' });
$s->next;
2/ Execute the script
=> Without the patch, you should not get any error. If you have the mysql logs
enable, you will see the query
=> With the patch applied, you will get a "unknown column" error
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 16e55c1f3283402f766ed844baa5db333ed2f585) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
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>
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>
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>