Jonathan Druart [Tue, 5 Jan 2016 15:41:36 +0000 (15:41 +0000)]
Bug 15398: Hide Staff members only in the patron deletion/anonymization tool
On bug 9076 (commit 568a4c1230ee9a4002181fcab2c083faf6c323a9), the plan
was to hide the Staff members from the tool.
But the test was wrong, it was done on the category_code instead of the
category_type value.
Test plan:
1/ Create a category 'Student' which is not part of the Staff
(category_code=S, category_type!=S)
2/ Create a staff category (category_type=S)
3/ Go on the deletion/anonymization tool (tools/cleanborrowers.pl) and
confirm that the category Student category is displayed in the dropdown
list.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described, no errors.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
http://bugs.koha-community.org/show_bug.cgi?id=15308
Jonathan Druart [Tue, 19 Jan 2016 16:58:07 +0000 (16:58 +0000)]
Bug 15391: Fix HoldsQueue.t tests
Prior to this patch, in HoldsQueue.t:
63 my @item_types = C4::ItemType->all;
64 my $itemtype = grep { $_->{notforloan} == 1 } @item_types
65 or BAIL_OUT("No adequate itemtype");
Then we use the $itemtype variable (which contains the number of item types not for loan):
Marcel de Rooy [Thu, 14 Jan 2016 11:29:45 +0000 (12:29 +0100)]
Bug 9754: koha-remove optionally includes var/lib and var/spool
Currently, the files in the folder /var/lib/koha/[instance] and also
in /var/spool/koha/[instance] are not removed.
This patch adds the option -p|--purge-all to include those two
directories when removing files.
Note: There was a small bug in the for loop. On the -k line the extra
shift statement is one too much.
NOTE: Verify that you use the adjusted koha-remove in the test plan
and not accidentally an older version of this script.
Test plan:
[1] Create an instance test.
[2] Run koha-remove and verify that /var/lib/koha/test still exists.
[3] Create an instance test2.
[4] Run koha-remove -k -p and verify that the sql database still exists
but the two instance folders in var/lib/koha and var/spool/koha are
gone.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 1d99fa026bb05225df93e56740456ba185a5937d) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 69fd29942c843b8b15df1bb75cd25451344341ba) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Mon, 28 Dec 2015 15:47:01 +0000 (15:47 +0000)]
Bug 15209: Check the parameter at the beginning of the subroutines
It seems better to check if parameters exist at the beginning of a
subroutine.
It makes the code easier to read and there is 1 indentation level less.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 372881ebfd5552ecb83450c7afea6a76f2df1a0b) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 7132c9b49ca0c2abf7592d56e4b467be9107dd3f) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Mon, 28 Dec 2015 15:46:59 +0000 (15:46 +0000)]
Bug 15209: Add tests
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit c273e888b0468c6d8e943f9989f6680dc63203fa) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit bc287802a996b265d008845867f1691eeca576d9)
Colin Campbell [Wed, 18 Nov 2015 14:53:58 +0000 (14:53 +0000)]
Bug 15209 Validate passed MARC::Record objs in C4::Koha
Ensure that a passed MARC::Record is defined before calling
its methods. Otherwise you are open to occurences of the
error 'Can't call method "field" on an undefined value'
In a CGI environment you can live with such sloppiness but
in a persistent environment the error can cause the instance
to abort.
Made all routines passed a MARC::Record validate it before calling
its methods. Changed the parameter name from the meaningless
record to marcrecord to indicate its content. Added an explicit return
for all cases where no valid data returned. Cleaned up some logic for
clarity. I think we can assume that GetNormalizedOCLCNumber meant to
look at all 035s till it found an OCLC number not just the first.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 960458dee4a9c09506f48fa73950c0e2da3611e7) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 958985b2ff7304cc55a620e0cd1f09d31d213463) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marcel de Rooy [Wed, 27 Jan 2016 14:44:31 +0000 (15:44 +0100)]
Bug 15240: [QA Follow-up] Minor adjustments
This patch does:
[1] It removes some unused modules.
[2] It adds some options not listed in the synopsis.
[3] It removes an unused sql expression from one query.
Note: In fines related code the third parameter of CalcFine sometimes
is named as days_overdue too.
[4] Corrects a few typos in comments or pod.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 8d072272fa396820ec655fb7b45d30eee6fca3e8) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit b94fc3419dc04d06d7557753cea619633ab4c8dd) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Fixing the evals in PerlModules.pm to pass perl critic has caused
a regression. If appears that using a block eval will not work here,
at least not in its current form.
Chloe [Thu, 21 Jan 2016 23:47:42 +0000 (23:47 +0000)]
Bug 12045 - Transfer impossible if barcode includes spaces
have changed the code which strips the white space to only remove the leading and trailing white space instead
To Test-
1- go to circulation -> transfer
2- attempt to tranfer an item where the barcode has a space in the middle of it
3- it should fail
4- apply patch
5- try again
6- it should work
NOTE: I purposefully added: die "($barcode)";
Before, all spaces were removed.
' white space ' became '(whitespace)'
After, only external spaces were remove
' white space ' became '(white space)'
Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 47caf69a469cb48ef18754d2e3bf077e5e882aa4) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 8fa06fdfde407522d6f647527e1b3fefa52a154d) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Kyle M Hall [Fri, 8 Jan 2016 17:00:36 +0000 (17:00 +0000)]
Bug 15530 - Editing a course item via a disabled course disables it even if it is on other enabled courses
It appears that if the course item is edited by clicking the edit link
from an active course, the course item will be set to enabled and the
fields will be swapped, if the same course item is edited from a course
that is *not* active, the course item will be set to *not* enabled, and
the original fields will be swapped back in!
The short term work-around is to only edit course items from an enabled
course if the item has a course that is enabled. If all the courses it
is on are disabled, it doesn't matter what course the item is edited
from.
Test Plan:
1) Create two courses, 1 enabled and 1 disabled
2) Add an item as a course reserve to both courses
3) Edit the course reserve data for the item via the enabled course
4) Note the course item is enabled ( easy way is to check the database )
5) Edit the same course reserve data, but via the disabled course
6) Note the course item is now disabled even though it is part of
an enabled course!
7) Apply this patch
8) Repeat steps 1 through 5
9) Note the course item is still enabled
Signed-off-by: Margaret Holt <mholt@bastyr.edu> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit d10adb26aa661a6b5f6dc9b2fd6f8ab966f98918) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 4739952294165f764ee7074f5a71235e328697a3)
Kyle M Hall [Fri, 8 Jan 2016 17:00:18 +0000 (17:00 +0000)]
Bug 15530 - Add Unit Test
Signed-off-by: Margaret Holt <mholt@bastyr.edu> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 31ffdbf49af617db29c8b6bfcaf01566d84f2a33) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit cd7d29440f8b1f88b88cba0d9934e3907847793b)
Alex Arnaud [Tue, 29 Dec 2015 15:46:38 +0000 (16:46 +0100)]
Bug 15188 - Fixes remove_unused_authorities.pl will delete all authorities if zebra is not running
Test plan:
1) Shut down zebra: koha-zebra-ctl.sh stop
2) Execute the script: remove_unused_authorities.pl (with -t if you
don't want to really delete from your database).
3) Check that the script would have deleted all the authorities (eg:
31449 authorities parsed, 31449 deleted and 0 unchanged because
used).
4) Apply patch
5) Run, notice that the script dies because zebra is unavailable
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 128e7f54b17501ee43614aa8f8c50c3789921f08) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 6b6213deea813bf9040dfa5232546b9a48b41e37) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Tue, 9 Dec 2014 08:48:58 +0000 (09:48 +0100)]
Bug 6679: (follow-up) fix 9 perlcritic violations in C4/TmplTokenType.pm
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 8ca35dc7a9291a685a4d22aaf2c18e8023c7be4f) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 8022419f58b7dc861f235e568b4abd4c9b26f352) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Mason James [Mon, 24 Sep 2012 23:21:43 +0000 (11:21 +1200)]
Bug 6679 - Fixing code so it passes basic Perl:::Critic tests
opac/ilsdi.pl: Stricture disabled at line 217, column 17. See page 429 of PBP. (Severity: 5)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit f2eb9681457627e24ba44bcbb0aa64792a88cc4e) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit a6f2231b4fe772b2f2fa5c5ac3bed3449013f163) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Mason James [Tue, 26 Jun 2012 17:07:46 +0000 (05:07 +1200)]
Bug 6679 - [SIGNED-OFF] fix 2 perlcritic violations in C4/Installer/PerlModules.pm
Expression form of "eval" at line 71, column 9. See page 161 of PBP. (Severity: 5)
Expression form of "eval" at line 85, column 13. See page 161 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 0e356b214eb049a446a8d089d579775aa49287d7) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit f8bd7e717927c65782f544ee0b5a3ec38a3330ad) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Mason James [Tue, 26 Jun 2012 13:08:34 +0000 (01:08 +1200)]
Bug 6679 - [SIGNED-OFF] fix 9 perlcritic violations in C4/TmplTokenType.pm
- Subroutine prototypes used at line 86, column 1. See page 194 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit ae546e3adefaf06279e4a380346a4a302acd869a) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 25344fa446836a99e74f5931ee702748001897e1) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Mon, 11 Jan 2016 11:32:23 +0000 (11:32 +0000)]
Bug 2669: Change checkboxes to radio buttons on dictionary
On creating new dictionary for report, the choice between "All dates"
and "Date range" should be a real radio button, not 2 radio buttons with
different names (which means they could be selected altogether...)
Note that I don't understand what means 'All dates', there is no
condition generated for the dictionary. We should not have to select a
field if we don't want to add a condition on it :)
Test plan:
Create a new dictionary for the Patron module, then a date field
(dateenrolled or birthdate, etc.)
Confirm that the radio buttons now behave as radio buttons...
Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Looks so much nicer too!
Radio buttons display as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit bb6658c2e680d615bccd6d5d2f4c971035a44ea1) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 58f3635e6cbc6e5ca0fe086d161237c6e989bfe0) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Natasha [Wed, 20 Jan 2016 03:47:06 +0000 (03:47 +0000)]
Bug 15602: Accessibility: Can't tab to add link in patron card creator add patrons popup
To Test -
1. Go onto Tools and then click on Patron Card Creator.
2. Click on New and then Card Batch.
3. Add a borrowernumber then add patron.
4. Search for a patron.
5. Using the tab key try to navigate onto the Add link.
6. Notice it skips Add.
7. Apply the patch and then repeat steps 1-5, notice the add link can now be
accessed through using the keyboard.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as described.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 7d08937033dfc99c584e6e4433c49b5ca66e21c4) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 0c4c2a9dd570320d610b48a264eade3e89429be0) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Chloe [Mon, 18 Jan 2016 22:31:19 +0000 (22:31 +0000)]
Bug 14613: Send cart window is too small in staff and hides 'send' button
To Test: Add an item to cart click "cart" click "send"
confirm that the send window is larger and the send button is
visible
NOTE: Remember to clear cache to refresh javascripts.
This is much more visible if you zoom in 10% or more.
This is larger, but more of a stop gap if you've got a large zoom.
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 d7879843b1fe9d9404c9c854beb3a2a21122035d) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 8cd36b8ff2d318986749f0fcc13f71cc7a1d3708) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Wed, 13 Jan 2016 16:36:47 +0000 (16:36 +0000)]
Bug 15569: Do not displayed "automatic renewal" if the patron cannot checkout
If the patron cannot checkout (debarred) and on-site checkout is
enabled, the "Automatic renewal" checkbox should not be displayed on the
circulation screen.
Test plan:
Enable OnSiteCheckouts and OnSiteCheckoutsForce
Debar a patron and go on the circulation page.
Without this patch, the automatic renewal checkbox is displayed.
With this patch applied, it's not.
Patch works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit ca6bd89b852f4561fdc4ff328d19d4a71d759b7f) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 3a79e99b7093aa98b31313d8ea545557ca4277cd) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Natasha [Wed, 20 Jan 2016 01:22:45 +0000 (01:22 +0000)]
Bug 15603 - Accessibility: Can't tab to select link in budgets add user popup
To Test -
1. If you don't have a budget and a fund, make at least one of each.
2. Go to funds from budgets.
3. Either make a new fund or edit an existing one and then click Edit owner, which will bring up a pop-up tab.
4. Search for a patron.
5. Using the tab key try to navigate onto the Select link.
6. Notice it skips select.
7. Apply the patch and then repeat steps 3-5, notice the select link can now be accessed through using the keyboard.
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 83d6155552405cbad987e7444753ae2ed3c5e011) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit c22bc02ad791329518c18fb94bb3bcbc84a08009) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Owen Leonard [Tue, 19 Jan 2016 16:36:44 +0000 (11:36 -0500)]
Bug 14193 - Accessibility: Searching patrons using the alphabetic index doesn't work
Using a mouse to click on the alphabetic index letters works even though
the anchor markup doesn't contain an href attribute. However you
can't tab to them using the keyboard, and I assume the issue with
screen readers is related.
This patch adds a dummy href attribute and a class-based click handler
so that we can get rid of the "onclick" attribute in the markup.
To test, apply the patch and visit the "Patrons" section.
1. Use the tab key to move the focus to one of the alphabet links.
2. Hit "Enter" and confirm that the search is performed correctly.
3. Click any of the alphabet links and confirm that clicking works as
well.
4. View the details of any patron and click the "Add child" button.
5. In the "Guarantor information" section click the "Change" button.
6. In the search popup, use the tab key to move the focus to one of the
alphabet links.
2. Hit "Enter" and confirm that the search is performed correctly.
3. Click any of the alphabet links and confirm that clicking works as
well.
Signed-off-by: Briana <brianagreally@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 6d6b2078c061c63db762d1ceff45d0eb7e391f02) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 6a2e6abb27f34f7d5557d77e9ef7fbf7ec740072) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Wed, 13 Jan 2016 17:51:01 +0000 (17:51 +0000)]
Bug 15570: (follow-up) Bug 11944 Remove all utf8 filter from templates
Test plan:
use circ/renew.pl to renew an issue.
Without this patch, you will get an error.
Note: The error exists for 1 year now and nobody complained?? Does
someone still use this script?
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit de823801e6f021982f8857b59a593ed28c433798) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 90a5c6690949aa81e1391e50f2f1ec8ffcd4f18b) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Katrin Fischer [Wed, 20 Jan 2016 00:46:14 +0000 (01:46 +0100)]
Bug 15560: Fix display of multiple branches and locations in pending reserves report
The patches from bug 12152 broke the display on the pending reserves/
holds to pull report when items from multiple branches and with
multiple locations were displayed. The table cells were left empty.
To test:
- Add a record with at least 2 items from different locations and
holdingbranches
- Open the 'holds to pull' report
- Verify all branches and locations show with their correct
description
Signed-off-by: Natasha <tasham_8@hotmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 363cb9c02ed017a0a20951d5caa9f9e5376600d0) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 16049ee599d64dfdef7bbb37bd15db2d4ec83547) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Frédéric Demians [Tue, 12 Jan 2016 10:53:11 +0000 (11:53 +0100)]
Bug 15572: Follow-up to fix error on authority creation
Bug 6657 modified the way C4::Biblio::TransformHtmlToMarc operates in order to
solve an issue occuring during biblio record cataloguing. But this function is
also used by authorities cataloguing, and the code in this case is irrelevante.
This followup allows to distinguish for which kind of record
TransformHtmlToMarc is called: biblio/authority.
A bug appears in authority creation without this patch in some circunstances:
when authid is linked to 001 field.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Tested with a new authority record
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit 2ca9bd5dc247ae26225cbc299c1bc0883bc444e0) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 44bd1995bf8577713a7d6fca83a52ed14cd6d7fa) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Wed, 20 Jan 2016 08:45:48 +0000 (08:45 +0000)]
Bug 15607: batch patron mod - do not update dates if not given
Bug 15332 fixed a bug but introduced a bigger one. Even if dateenrolled and
dateexpiry are not modified, they will be updated to today.
Indeed, dt_from_string returns today without parameters.
Test plan:
- Set dateenrolled and expirydate for a patron
- Using the batch patron mod tool, update any field but dateenrolled and
expirydate.
=> Without this patch, the 2 date fields should be set to today
=> With this patch applied, the 2 date fields should not have been
modified.
Signed-off-by: Karam Qubsi <karamqubsi@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit 2505a3d840c15e51c7967a576d53a416b5f92bfb) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit f0c36157ef13ad7a8f4238128cb145d94b9c9504) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Mon, 21 Dec 2015 12:24:46 +0000 (12:24 +0000)]
Bug 15367: Do not display repeatable patron attributes in the batch patron modification
The repeatable patron attributes are not correctly managed and can cause
data lost. To avoid that, the easier way is not to display them in the
batch patron modification tool.
This should be implemented, as a new enhancement.
Test plan:
Create some patron attributes, some should be repeatable.
Use the batch patron modification tool to modify patrons.
With this patch, the patron attributes marked as repeatable won't be
display anymore.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works as described, no koha-qa errors
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 9030800e78ad7de868e1c5fa4c9fd469660e6e5d) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 2fbd04103a1807efd7378a3ee9c60e7974ccb606) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Some variables were not correctly renamed in a previous patch,
resulting in the fines tab of the OPAC patron summary page
not showing correctly.
To test:
- Go to the OPAC patron account
- Check the display of the Checkouts, Fines and Holds tabs on
the summary page
- Verify that with the patch, the display is corrected
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 bca01829c9bb86f5183d8a1bf93236ec8cf67be2) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit c29372726a320fc4e445163bb78478e2fc249b44) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Tue, 5 Jan 2016 15:54:59 +0000 (15:54 +0000)]
Bug 15412: Enable dropdowns date selector when suspending holds
It seems to be the way to fix that
https://stackoverflow.com/questions/13649459/twitter-bootstrap-multiple-modal-error
Test plan:
1 - Place a hold through the opac
2 - View your account->Holds
3 - Click suspend hold
4 - You should be able to select a date using the arrows and dropdowns
Followed test plan, works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 01d48a78258f98f693a8f48d7294a6ae880d5fc4) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 2c84b8a78bef287e1563ec10527e0f67cc39d125) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Tue, 5 Jan 2016 08:14:30 +0000 (09:14 +0100)]
Bug 15462 - Unable to renew books via circ/renew.pl
To verify: Got to circ/circulation.pl and try to renew an item.
Result: Can't call method "single" without a package or
object reference at /usr/share/kohaclone/circ/renew.pl
line 57
To test:
- Apply patch
- Try to renew items that are or are not checked out. Error
no longer occurs.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 68dee0de8e244e1badf51e7603ecd7341826c23c) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 5686ba50ba005b1cd8cf4d28a35c28c0c34d3c71) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Kyle M Hall [Thu, 2 Oct 2014 13:19:21 +0000 (09:19 -0400)]
Bug 13022 - Hardcoded limit causes records with more than 20 items to show inaccurate statuses
If a record has more than 20 items, all the items over 20 will show as
available on the search results even if they are not!
This is a hard coded limit in the Search module. This number should be
configurable.
Test Plan:
1) Create a record with more than 20 items
2) Set all the items to waiting holds or in transit
3) Search for results that will include that item
4) Note some say they are available even though they are not
5) Apply this patch
6) Run updatedatabase.pl
7) Set the new system preference MaxSearchResultsItemsPerRecordStatusCheck
to a number larger than the number of items on your record
8) Re-run the search
9) Note that the hold and transit statuses for the items are now correct
Signed-off-by: Andreas Hedström Mace <andreas.hedstrom.mace@sub.su.se> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit d3184fa85b8906d0921522ce0c26dab98a4a2778) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit f552e658e44208e86b03bcd659d41eaedd69ae46) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Magnus Enger [Tue, 8 Dec 2015 20:11:58 +0000 (21:11 +0100)]
Bug 15304: Remove Norwegian strings from nl-search.tt
When nl-search.pl gets data from the Norwegian national patron
database, it does so in an XML format that has Norwegian element
names. nl-search.pl displays the data with the Noregian element
names as labels. This means Norwegian words turn up in translations,
which is messy. This patch replaces the Norwegian labels with
English ones.
To test:
- Only Norwegian libraries and vendors get access to search against
the national patron database, so a proper functional test is not
possible
- Alternative 1: Just have a look at the nl-search.tt template
before and after the patch and verify that after the patch the
Norwegian strings that would be visible to a user are gone
- Alternative 2:
- Verify that e.g. en-GB-staff-prog.po contains the Norwegian
string "kjonn"
- Apply the patch
- Create new .po files with e.g. "./translate create en-GB"
- Verify that "kjonn" is now gone from en-GB-staff-prog.po
Version 2: Tweak a couple of labels to be more in line with labels used
elsewhere in Koha, to avoid variants when translating.
Version 3: Replace e.g. "Gender: </span>" with "Gender:</span> " to
avoid similar-except-for-whitespace strings in translation.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
A few new strings, all previous removed.
No koha-qa errors
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit bd4a6830527b3d1482e41f084098de66eacf5bcd) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 8314d1beb5cd38a0d9e8a1cbbca13be508727fd9) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Hector Castro [Mon, 9 Nov 2015 17:05:39 +0000 (11:05 -0600)]
Bug 15170 - Add 264 field to MARC21*DC.xsl
Modify MARC21*DC.xsl to add RDA 264 field
To test:
- Copy from LOC z39.50 the Maxwell's handbook for RDA (ISBN 9780838911723)
- Look the field 264 in framework, save record
- Open this URL in OPAC
And play with id (the number of new record for Maxwell book) &
format parameters
Test format=rdfdc, format=srw_dc and format=oai_dc
- Notice that <dc:publisher> and <dc:date> are not present
- Apply this patch
- Reload the URL for the three formats
- You will see the tags publisher and date are taken from 264
Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 7d16555427db2ee3bf39840df43f134e369ff113) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 65e8776f013a6727b88cdaca900a28ea1ed8aaf0) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Martin Renvoize [Fri, 18 Sep 2015 08:10:27 +0000 (08:10 +0000)]
Bug 14034: Fix logout on refresh for shibboleth
This is similar to bug 12877
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
While this is missing a detailed test plan, what I did to test was
1/ Login to koha .. it works
2/ Apply patch
3/ Login to koha .. it still works, no regressions. I can't test the
shibboleth part but it doesnt break anything else so I'm happy to sign
off
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
We had to implement this fix for one of our customers using Shibboleth.
Can verify that it fixes the issue (which, incidentally, breaks
stage-marc-import since that depends on a constant sessionID).
Passing QA (verified with QA tools). Thanks, Martin!
Katrin Fischer [Sun, 22 Nov 2015 02:01:18 +0000 (03:01 +0100)]
Bug 14397: Fix tiny typo in database documentation
Fixes Foriegn to Foreign.
Signed-off-by: Aleisha <aleishaamohia@hotmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 89a058787a58295193a60c1a1fbb8b5b5262e7ed) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit ede83df30b3a8f7c52ae8a2ba6de99fde3117953) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Tue, 15 Dec 2015 16:06:17 +0000 (17:06 +0100)]
Bug 15383 - Opac: Autority details: Fix translation issues with a tags
Fix translation issue in opac-auth-detail.tt and opac-auth-MARCdetail.tt
(string splitting by link tag) making it hard to have a gramaticaly correct
translation.
To test:
- Apply patch
- In OPAC, go to search an Authority and display details (View full heading)
- Verify the line "Usage in records: x" in both Normal view and MARC view
Signed-off-by: Aleisha <aleishaamohia@hotmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Not sure if "Usage in records" is the best wording, but I have no great
options either, "Number of records used in:"?
Jonathan Druart [Thu, 5 Nov 2015 11:32:47 +0000 (11:32 +0000)]
Bug 15138: Fix typo timestamap
Introduced by bug 14426, should be backported to all supported stable
version (3.14, 3.16, 3.18 and 3.20).
Test plan:
got on Home › Reports › Patrons with no checkouts
Fill the Not checked out since,
you will never get any result, a sql error is in the log
Unknown column 'issues.timestamap' in 'where clause'
Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Thu, 31 Dec 2015 11:43:54 +0000 (11:43 +0000)]
Bug 15344: Remove one occurrence in circ/circulation.pl
In C4::Circulation::CanBookBeIssued, $borrower->{flags} is called and
should be populated by GetMemberDetails
It fixes the following error on checking out:
Can't use string ("1900156") as a HASH ref while "strict refs" in use at
/home/koha/src/C4/Circulation.pm line 813.
Note: Error occurs with patrons with staff permissions, not with 'normal' patrons.
Error is fixed with this patch. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Bug 15080 - ./translate tool should tell if xgettext executable is missing
Just upgraded our Koha container to 14.04 and noticing the
misc/translator/translate doesn't work. This is because of a missing
package gettext.
This patch makes ./translate die with a helpful suggestion to install
gettext if xgettext-program is missing.
Signed-off-by: Frederic Demians <f.demians@tamil.fr>
I can reproduce the bug by desinstalling 'gettext' package on a Debian
box. I confirm that without this patch, 'translate' command fails
miserably. Suggesting to install gettext package is welcomed.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit 37b0e2ce9cbc4ba5070d22c96b357ddea1db084b) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 52a9bed15f91699981b27cc78fee54fd9bd378df) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Test plan:
-apply patch
-in cataloging, open a record in a framework that uses the plugin
-open LEADER/000 and check that the label says "0-4 Record size" now
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Good catch, fixed tab, no errors.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 4e61aa5ef55e214e60920eb3556f0c96dbe3e23a) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 2763eb87de9a234d0ba8e84042ed26bfa7fbdadc) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Katrin Fischer [Sun, 22 Nov 2015 01:52:02 +0000 (02:52 +0100)]
Bug 14853: Change 'Fund' to 'Shipping fund'
Changes the 'Fund' to 'Shipping fund' so it's clear
what the fund setting is used for.
To test:
- Receive a new shipment
- Verify that 'Shipping fund' displays on the parcels page
- Search for your invoice
- View invoice details
- Verify that 'Shipping fund' displays on the invoice page
Followed test plan (changed lines: '...cost' -> '...fund')
Display OK on both places. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 3f68107b1012e47467d1fb96b44347499332ba22) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 855cd2a40080a39eeb35d3977a62c0f6909e5218) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Wed, 9 Dec 2015 15:10:10 +0000 (16:10 +0100)]
Bug 15340: Translatability: fix issue with 'or choose' splitted by <strong> tag
This patch fixes a translatability issue due to <trong> tags.
To verify:
- Make sure that you have some entries in 'Cities and Towns'
( Home > Administration > Cities )
- Edit the main address of a patron's details
- Locate field "City", at the right you have the text 'or choose'
followed by a drop-down ('choose' is bold)
- change language e.g. to German, the text reads 'or auswählen'
(instead of 'oder auswählen')
- This is due to the <strong> tags around 'choose'
To test:
- Apply patch
- Verify that the <strong> tags around 'choose' are removed in:
koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit a85fd85545a885e8ebbcc417b7f180baede70304) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit e33bcec68855397ca16f352ff63c85e3789bea36)
Kyle M Hall [Tue, 22 Dec 2015 15:37:41 +0000 (15:37 +0000)]
Bug 15409 - Plugins section missing from Admin menu sidebar
The sidebar menu in the Admin area of Koha is missing a section for
Plugins.
Test Plan:
1) Apply this patch
2) Log in with a user that has plugin permissions
3) Browse to a page with the admin menu sidebar, such as
/cgi-bin/koha/admin/transport-cost-matrix.pl
4) Note the new Plugins section with a link to manage plugins
5) Log in with a user that has no plugin permissions
6) Revisit the same page, note the Plugins section is no longer visible
Signed-off-by: Aleisha <aleishaamohia@hotmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 65d3203525470d8b0b44374bdc66b979de57c426) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 2f7f6e9ac01476e4a7a6acee829a1fc33985c2a2) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Mon, 28 Dec 2015 15:00:54 +0000 (16:00 +0100)]
Bug 15432: t/db_dependent/Letters.t depends on external data/configuration
To test:
- Set system preference LetterLog to 'Don't log'
- prove t/db_dependent/Letters.t
- Result: Fails on test 62 - Successfully sent claim
- Apply patch
- Test again
- Result: Pass OK
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch: removed the bug reference, not needed.
Aleisha [Sun, 20 Dec 2015 19:57:54 +0000 (19:57 +0000)]
Bug 15373: More changes of Zip to ZIP on intranet
To test:
- Log in to Staff Interface, go to Administration, Libraries and Groups (cgi-bin/koha/admin/branches.pl). Click 'New library' and confirm that it says 'ZIP/Postal Code:' in the form.
- Go back to Administration, Cities and towns (cgi-bin/koha/admin/cities.pl). Confirm it says 'ZIP/Postal code' in table heading. Click 'New city' and confirm it says 'ZIP/Postal code:' in form
- Go back to Administration, Global system preferences, I18L/L10N (cgi-bin/koha/admin/preferences.pl?tab=i18n_l10n). Under AddressFormat, confirm all available options say '[ZIP/Postal Code]'
- Go to Reports, Patrons (cgi-bin/koha/reports/borrowers_stats.pl). Confirm it says 'ZIP/Postal code' under Title
- Go to Tools, Batch patron modification (cgi-bin/koha/tools/modborrowers.pl), enter any card number and click 'Continue'. Confirm it says 'ZIP/Postal code' in the table of patron details, and in the form to edit
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
NOTE: Tested together with first patch.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 5df49b04ef69ad6b33b3f7744acb379c0dd83b0f) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 776f738382010f2d9ce8eef7efc73ed5fca45d6c) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Aleisha [Mon, 14 Dec 2015 22:43:26 +0000 (22:43 +0000)]
Bug 15373: Changing Zip to ZIP on OPAC and Intranet
To test:
1) Login to OPAC --> You personal details.
2) Ensure it says 'ZIP/Postal Code' under Main Address, Alternate Address and Alternate Contact
3) Login to Staff interface --> Go to a member's page (ie koha/members/memberentry.pl) --> Details.
4) Ensure it says 'ZIP/Postal Code' under Alternate address and Alternative contact
5) Click Edit
6) Ensure it says 'ZIP/Postal Code' under Main Address, Alternate Address and Alternate Contact
Signed-off-by: Barry Cannon <bc@interleaf.ie> Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
NOTE: Tested together with second patch.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3da8abcfeff331d5022ee54bbf27ecfbc4ebe18c) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 6438df72872d88c263b4fa331c2d44adb0ac2fa4) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Mark Tompsett [Tue, 15 Dec 2015 15:15:25 +0000 (10:15 -0500)]
Bug 15382: 245$a visibility constraints not respected in opac-MARCdetail.pl
This tiny change determines if the bibliotitle should be set or not
in accordance with the 'Advanced constraints' visiblity setting for
OPAC.
TEST PLAN
---------
1) Find a record detail in OPAC
2) Click 'MARC view'
-- 245$a should be visible.
3) In a new tab, log into the staff client
4) Click 'Koha administration'
5) Click 'MARC bibliographic framework'
6) Click 'MARC structure' for the framework of
the record displayed in OPAC.
7) Search for tag: 245, and click 'Search'
8) Click 'Subfields'
9) Click 'Edit' beside the a subfield.
10) Click 'Advanced constraints'
11) Uncheck 'OPAC'
12) Click 'Save changes'
13) In the OPAC tab, refresh
-- 245$a (Title) will still be visible!
14) Apply this patch
15) In the OPAC tab, refresh
-- 245$a (Title) will be hidden.
16) In the staff client, navigate back to
'Advanced constraints' and check 'OPAC'
17) Click 'Save changes'
18) In the OPAC tab, refresh
-- 245$a (Title) will be visible again.
19) Run koha qa tools
Signed-off-by: Aleisha <aleishaamohia@hotmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit d827bb50d93a83c0ab7ce326675284bee411959a) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 7f708a361b95c449a972b8571acde4c52d3f336b) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Owen Leonard [Sat, 5 Dec 2015 01:37:47 +0000 (20:37 -0500)]
Bug 15327: Minor tweaks to Bootstrap modal handling on Staged MARC management page
This patch makes a couple of minor corrections to the template for
staged MARC management. The MARC preview is now formatted using the
"html" option, and some obsolete Greybox-related code has been removed.
To test:
1. Apply the patch and go to Tools -> Staged MARC management.
2. Click any staged MARC file containing multiple records.
3. Click the title in the "Citation" column and confirm that a Bootstrap
modal is triggered showing the correct data.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Modal looks much better. Works as advertised
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 23c7de2bc7af7d2d8bf725e536f665bf78116065) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 53cebcb07d8e5c58aa4f9e9da25e9be11444ee51) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Bug 15405 - XML paths to zebra libraries is wrong for 64-bit installs on non-Debian linux
Adjusts the modulePath to search in the well-known location for 64 bit
systems. Required for at least Fedora.
Test plan:
Without this patch, doing a zebra reindex on a fedora-based install will
cause errors like this:
15:10:47-01/05 zebraidx(16108) [warn] No such record type: dom./etc/koha/zebradb/biblios/etc/dom-config.xml
With this patch, reindexing should just work.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
I have tested this doesn't break on debian/ubuntu systems, someone with
a non debian system will need to test it on that
Signed-off-by: Bob Ewart bob-ewart@bobsown.com
It works on openSUSE Leap 42.1
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Just noting that the debian zebra files already contain much more paths
here.
Frédéric Demians [Wed, 30 Dec 2015 12:10:16 +0000 (13:10 +0100)]
Bug 15429 UT for _parseletter modifying its parameter
Before/after applying the related patch, do:
prove -v t/db_dependent/Letters.t
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit fd07e3296b64a78edf1cf947a824147f1adbba1a) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 2eac97ba65d869f34641f6eb7fd22047a104a794) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Mon, 28 Dec 2015 09:29:17 +0000 (10:29 +0100)]
Bug 15429 - sub _parseletter should not change referenced values
In C4/Letters.pm, sub _parseletter changes values that are passed by
reference. E.g. patron's expiry date can change from iso format to
syspref format, leading to strange behaviour in the calling routines
(see Bug 15423).
This patch makes sub _parseletter work on a copy of the referenced values.
(Submitted to get feedback - is this the way to go?)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Good solution to real time bomb.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 002a2dcb1f1faed12a24fd820dc5fdaad60f3512) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit cc3b2d05905b8c6c7000a0252e277c151c0eeae6) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Fridolin Somers [Wed, 25 Nov 2015 13:02:05 +0000 (14:02 +0100)]
Bug 15252 - Add tests
Tested 4 patches together, 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: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f0da781368a187337236d64ee94d9c8cc65f90f7) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 638a6343f653fdf0a04504ada952d01978d4733a)
Fridolin Somers [Wed, 25 Nov 2015 11:34:18 +0000 (12:34 +0100)]
Bug 15252 - Patron search on start with does not work with several terms
When searching a patron, search type can be 'start with' and 'contain'.
If the search text contains a space (or a coma), this text is splitted into several terms.
Actually, the search on 'start with' with several terms never returns a result.
It is because the search composes an "AND" SQL query on terms.
For example (I display only the surname part) :
search type = contain :
'jean paul' => surname like '%jean% AND %paul%'
search type = start with :
'jean paul' => surname like 'jean% AND paul%'
The query for 'start with' is impossible.
I propose, for search with start with, to not split terms :
jean paul => surname like 'jean paul%'
One can always use '*' to add more truncation :
jea* pau* => surname like 'jea% pau%'
This bug affects a lot surnames with several terms like 'LE GUELEC' or 'MAC BETH'.
Note that the patch moves :
$searchmember =~ s/,/ /g;
It removes the test "if $searchmember" because $searchmember is tested and set to empty string previously :
unless ( $searchmember ) {
$searchmember = $dt_params->{sSearch} // '';
}
Test plan :
==========
- Create two patrons with firstname "Jean Paul"
- Go to Patrons module
- Choose "Starts with" in "Search type" filter
- Perform a search on "Jean Paul"
=> without patch : you get no result
=> with this patch : you get the two results
- Check you get the two results for search on "Jean Pau"
- Check you get the two results for search on "Jea* Pau*"
- Check you do not get results for search on "Jea Paul"
- Choose "Contains" in "Search type" filter
- Check you get the two results for search on "Jean Paul"
- Check you get the two results for search on "Jean Pau"
- Check you get the two results for search on "Jea* Pau*"
- Check you get the two results for search on "Jea Paul"
- Check you get the two results for search on "Paul Jean"
Signed-off-by: Alex <alexklbuckley@gmail.com>
Tested 4 patches together, works as expected Signed-off-by: Marc Véron <veron@veron.ch>
Bug 15252 - Patron search on start with does not work with several terms - followup 1
'start_with' is the default value of $searchtype, it can be explicit.
Tested 4 patches together, works as expected Signed-off-by: Marc Véron <veron@veron.ch>
Bug 15252 - correct UT searchtype value is contain and not contains
Tested 4 patches together, 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: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a4f5564c855e31f6872fb5e3ef378381473f837c) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit db50ac5b8c6c72d15f4c5e2a96544abde432b0f6)
Jonathan Druart [Wed, 2 Dec 2015 11:38:27 +0000 (11:38 +0000)]
Bug 14636: Remove debug message
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 9b9fb3ee0555cd51007af669f753f0a0e5ec661e) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 05e70e2e48d37ae0c68fcb82117e3d120710810f) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Katrin Fischer [Sat, 21 Nov 2015 21:37:03 +0000 (22:37 +0100)]
Bug 14636: Item search - improving display
- Changes "Publication Date" to "Publication date"
in the CSV export
- Fixes 'no JavaScript fallback' display to match
the normal display
- only show 'by' when it's UNIMARC and an author
exist
- show copyrightdate if publicationyear is empty
To test:
- Turn of Javascript in your browser before you
item search. This will activate the alternative
display.
- For MARC21:
- Verify that the author displays when existing
and no 'by' is shown.
- Verify that the publication date is now shown.
- For UNIMARC:
- Verify that 'by' only displays when there is
an author to display.
- Verify that the publication date is still
shown.
- Try the CSV export.
- Verify that the CSV header now reads 'Publication date'.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Successfully tested non-JS behavior and CSV export. DID NOT test
UNIMARC.
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 2aa6518c8a000a824e2659eaffc3d1ac54156544) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 704e932d648c66ad81c0f79d8ae6b388595bcbcf) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Katrin Fischer [Sat, 21 Nov 2015 21:32:52 +0000 (22:32 +0100)]
Bug 14636: Item search - fix search and sort by publication date for MARC21
Problem: MARC21/NORMARC stores the publication
date in biblio.copyrightdate, but UNIMARC uses
biblioitems.publicationyear.
To test:
- Without patch in a MARC21 installation:
- Search by publication date
- Verify that the results don't match the
publication year you searched for.
- Try sorting the table by publication year.
- Verify that the sort doesn't work.
- Apply patch.
- Repeat both, search and sort.
- Verify both work correctly now.
- Repeat tests on a UNIMARC installation.
- Verify both still work.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested searching and sorting successfully in a MARC21 installation. DID
NOT test in UNIMARC.
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 0d2e83bca5b91376e9262b6cb0b993f09b919018) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit d772f8732c9623e246a0fad33fef5282c044f368) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Wed, 9 Dec 2015 17:41:04 +0000 (17:41 +0000)]
Bug 15344: Remove some other calls of GetMemberDetails from pl scripts
Same as previously.
For these files it's a bit less obvious.
To make sure these changes won't introduce any regression, check that
the variable returned by GetMember is never used to get something
else than a borrower fields.
The 'flags' should not be get neither.
For opac-user.tt it's different, other keys are got but there are defined
in the pl script.
On the way:
- 'showname' is removed (never used)
- fix scope var issue in opac-user.tt (BORROWER_INF.OPACPatronDetails vs
OPACPatronDetails)
Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 010a32d95f871853f5c597b2670f3de4c62cfa51) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 95e9dafa38bf6f895cf62feac1df20e3b67a0640) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Wed, 9 Dec 2015 17:00:10 +0000 (17:00 +0000)]
Bug 15344: Remove unucessary call to GetMemberDetails
This subroutine does a lot a processing and should only be called when
necessary.
In the get_template_and_user subroutine (so called from any pages of
Koha), it is call to pass the branchcode, title, firstname, surname and
borrowernumber values for the logged in user.
This subroutine calls GetMemberAccountRecords which retrieve the items
infos for all accountlines entries of the logged in user.
On members/members.pl, let's say you have 74 entries in the accountlines
tables, the page will execute 115 SELECT instead of 35 if you don't have any
accountlines entries.
With this patch, the number of SELECT is always 31.
To test this patch you should have technical skills to know what to do.
Note that USER_INFO was an array of... 1 element. Now it's a hashref.
Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit ac541e0fa1c11254e110d94eed64c358e02e8aab) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 44202df6acdfcfb371eccc6b8e8007a871304e49) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Sun, 4 Oct 2015 09:38:03 +0000 (11:38 +0200)]
Bug 14948 - Display amounts right aligned in tables on patron pages
This patch set display amounts for charge, fine, price etc. right aligned in tables
on patron pages.
To test, apply patch and verify that amounts appear right aligned on following pages:
- Go to Home > Patrons, perform a search (Column 'Fines')
- Go to a patron with fines and credits
- Checkout tab (circulation.pl): Columns 'Charge', 'Fine', 'Price'
(maybe you have to show column with 'Show / hide colums')
- Fines Tab > Pay fines (pay.pl): Columns 'Amount', 'Amount Outstanding'
- Fines Tab > Account (boraccount.pl): Columns 'Amount', 'Outstanding'
Note: Test here 'Filter paid transactions' as well
Signed-off-by: Nicole Engard <nengard@bywatersolutions.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 1acc6094be7670c180bc006182a0f8e464abac03) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit fdb0cc80dbd323f8b7d60bb57af1e9bc6d126086) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Aleisha [Sun, 13 Dec 2015 22:24:05 +0000 (22:24 +0000)]
Bug 14153: Noisy warns in admin/transport-cost-matrix.pl
To test:
1) Go to Admin -> Transport cost matrix
2) Notice the warns in the error log
3) Apply the patch and refresh page
4) Notice page still works but no warns in error log
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch: Init a $op variable, if it must be reused later.
Nick [Wed, 18 Nov 2015 16:49:15 +0000 (11:49 -0500)]
Bug 15210 - Novelist throws an error if no ISBN
This patch makes opac-detail.tt check for an ISBN before attempting to load
Novelist content and prevents a js error which breaks other code.
To test:
1 - Enable novelist
2 - Add a visible change to OPACUserJS eg: $(document).ready(function()
{$("body").css("background-color","pink");}); 3 - Load a record with no ISBN
4 - Note you do not see a color change in the body and that there is an error
in the console 5 - Apply patch
6 - Reload the record
7 - You should see the color change and no error in the js
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 65c5fa4385a8e080cfd46a8197b4417bcd579b6a) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 77bd7557fa7adb196ed46fd7ae3ceea98db3a67c) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Kyle M Hall [Wed, 30 Dec 2015 14:26:35 +0000 (14:26 +0000)]
Bug 15442 - Checkouts table will not display due to javascript error
Uncaught ReferenceError: AllowCirculate is not defined
Test Plan:
1) Go to circulation.pl for a patron, note the checkouts table
does not load
2) Apply this patch
3) Reload the page, checkouts table should show
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c7339799ff994fffdb9273bd71951f8c2d60d1ec) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 14ee2557daafbb67b3afa541fc69f60fa21e7229) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Fri, 18 Dec 2015 15:01:15 +0000 (15:01 +0000)]
Bug 15332: Sent DateTime object to DBIx::Class, not formatted dates
If formatted dates are sent to DBIx::Class on update/insert, the date
will be set as 0000-00-00 (except if the format is yyyy-mm-dd).
Test plan:
Use the batch patron modification tools to update the dateenrolled or
dateexpiry values for at least 1 patron.
Without this patch, the modified value will be updated to 0000-00-00,
with this patch, the correct value will be set.
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit af7fb9cd48cdb47329e7b9bbe651e856e017aa13) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit d5fd02e4a17383e984c31e427dc2c64ce4726b51) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Colin Campbell [Thu, 19 Nov 2015 14:17:10 +0000 (14:17 +0000)]
Bug 15217 Remove redundant duplicate var declaration
remove superfluous second declaration of template, borrowernumber and
cookie which are never used
Also removed the variables @results and @results_array which are
declared but not used
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
As suggested by Colin, perl -wc catalogue/search.pl doesn't complain
anymore after applying the patch. perlcritic confirms the 2 variables
were unused.
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 558f291465d60c082c0e9a4a15eb7ed87a3e3fde) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 141f30d406671330bf31b199b4cdb78414176111) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Hector Castro [Mon, 23 Nov 2015 01:52:39 +0000 (19:52 -0600)]
Bug 15228: Switch "Items in batch number"
Yet another line to switch "Items in batch number" to
"Patrons in batch number"
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 e89714ea84acd8300a629a7acccc6eee90ff0ff0) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 008e3805ff1f6b59422286a33b55f4b509edca87)
Katrin Fischer [Sun, 22 Nov 2015 01:43:36 +0000 (02:43 +0100)]
Bug 15101: Don't display sys pref AllowPkiAuth under CAS heading
The system preference AllowPkiAuth display under the heading
CAS authentication, but is actually a separate authentication
option. Patch creates a separate heading for it.
To test:
- Go to Administration > System preferences > Tab Administration
- Verify that AllowPkiAuth is now displayed separately
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 cee796629fb131966a8ebfa77ecbcf054c46fd02) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 30bfb13466e875205f8052590e800247fb263952)
Marc Véron [Sat, 21 Nov 2015 02:25:56 +0000 (03:25 +0100)]
Bug 15238: Better translatability for Installer Step 1
This Bug streamlines html in installer/step1.tt for better translatibility.
To test:
Reviwe code and verify that changes in text make sense.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
To reproduce in Debian environment, remove a required module with
dpkg -r. Rewording Ok for translation purposes
Bug 15238: (followup) Remove word 'Note:'
'Note: ' removed as requested in comment #3
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Word 'Note' removed
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 29a4300c0727b779e1a0e83a35cd772828debde2) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 8a7bd3aa361ce707fd5e9fd478c7d7bbd0647312) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Sat, 21 Nov 2015 01:32:30 +0000 (02:32 +0100)]
Bug 15236: Better translatibility in "Connect biblio.biblionumber to a MARC subfield"
This patch moves html markup out of explanatory sentence in koha2marclinks.tt ("Connect
biblio.biblionumber to a MARC subfield") for better translatability.
To test:
- Apply patch
- Go to Home > Administration < Koha to MARC mapping
and edit a tag
- Verify that text change makes sense
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Rewording Ok for translation 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 f9586b01998071ddfdfc130ead2f48b079ae7e68) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit ae929c528367c135317d3058794028067b97ac90) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Sat, 21 Nov 2015 01:10:24 +0000 (02:10 +0100)]
Bug 15233: Cataloging subfield editors: Clean up html and streamline text for better translatability
This patch removes bold markup from explanatory text in auth_subfields_structure.tt
and makes it the same as in marc_subfields_structure.tt for better translatibility.
To test:
- Apply patch
- Verify that string changes make sense and that the explanatory text is the same in both files.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Rewording Ok for translation 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 9b0d9a186a7bffc16af2e5b2f67de31eb468a7a5) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit e10046a351ed9681a18b5eaf21ba320f833b057e) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Fri, 20 Nov 2015 21:58:40 +0000 (22:58 +0100)]
Bug 15231 - Import patrons: Remove string splitting by html tags to avoid weird translations
Some of the strings in Home > Tools > Import patrons contain html tags and therefore are
splitted in the translation tool. This makes it nearly impossible to create correct translations
from the partial strings.
Additinally, the notes for Extended patron attributes never displayed (due to a bug).
To test:
- Apply patch
- Enable Syspref 'ExtendedPAtronAttributes'
- Go to Home > Tools > Import patrons and verify, that the Notes at the right of the
screen make sense
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Split html tags removed, notes at right side it displayed correctly
Marc Véron [Wed, 2 Dec 2015 11:39:59 +0000 (12:39 +0100)]
Bug 15300: Translatability: Replace ambiguous 'From' and 'To' in members-update.tt
This patch replaces semantically ambigous words "From" and "To" in
koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
for better translatability.
To test:
- Apply patch
- Make sure that patrons can request detail changes in OPAC
(sysprefs opacuserlogin, OPACPatronDetails)
- Log in to OPAC, request a change of personal details
(cgi-bin/koha/opac-memberentry.pl)
- Log in to staff client
- Click link 'Patrons requesting modifications' or go to
Home > Patrons > Update patron records
- Verify that table headers make sense
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Rewording Ok for translation purpose
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit b07513526965720c7d558bd9c6176088304a2ee9) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit d8aa61c574022e842a9921beaa2fe723891b895d) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Sun, 13 Dec 2015 21:39:53 +0000 (22:39 +0100)]
Bug 15366 - Fix breadcrumbs and html page title in guided reports
This patch fixes following issues with breadcrumbs and html page title
in Home > Reports > Guided reports wizard:
- Sometimes, breadcrumbs display a stray > at the end
- While creating a report, steps are not displayed in breadcrumbs and
do not appear in html page title
- html page title is divided by newlines
To test:
- Apply patch
- Go to Home > Reports > Guided reports wizard
- Go to all pages including the steps for creating a new report and
verify
- that the breadcrumbs display properly and make sense
- in html source, the page title makes sense and displays on one line.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as descrived
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 639ccd469f4e00e1737e0dec6ee914d845907938) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit c7028a02b5158591665a35421b4a80f54f5324f3) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Sun, 13 Dec 2015 19:34:46 +0000 (20:34 +0100)]
Bug 15365: Translatability: Fix issue on Administration > Circulation and fine rules
Fix translatability issue on smart-rules.tt to prevent odd translations (Sentences
splitted by tags and newlines).
To test:
- Apply patch
- Go to Administration > Circulation and fine rules
- Verify that the lines "Note: " and "Important: " below "Default holds policy by
item type" make sense and are not splitted by tags and (in html) by newlines.
(Amended to fix commit message)
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
strong Note and Important displayed Ok for translation purpose
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit bc2e4ba86208e26d9890868d6deb5c65c263e907) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 0eff941b1b28ae1db1a2e11345a6d7cfb9616c3f) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>