Liz Rea [Thu, 17 Dec 2015 22:01:47 +0000 (11:01 +1300)]
Bug 15394 - Tidy up error messages in OPAC lists
To test:
Create a list in the OPAC, observe the message
Create another list in the OPAC with the same name, observe the message
Delete a list, observe the message
Check the patch itself, look for typos.
Signed-off-by: Aleisha <aleishaamohia@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 e7e1da85a5f6d770c559aa24964d61486a3c9ccb) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Lyon3 Team [Thu, 7 Jan 2016 09:48:42 +0000 (10:48 +0100)]
Bug 15501 - Planned Irregularities are deleted when modifying subscription
Add a warning to avoid saving a subscription whitout testing prediction pattern
when there are planned no published issues
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Ran through test plan, looks all good.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit d4c5bce132964a1b789cd84da2d5fefb43a1de35) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Tue, 5 Jan 2016 15:08:23 +0000 (15:08 +0000)]
Bug 15473: Make Koha::Objects->find accepts 0 and '' as a key
This bug has been found after bug 15381 was pushed:
If you go on authorities/authorities.pl, you expect a form to create a
authorities with a "Default" authority type.
Now, it explodes:
Can't call method "authtypetext" on an undefined value at
/home/koha/src/authorities/authorities.pl line 665.
Koha::Objects->find does not want to search if the key does not exist
(undef, '', 0). But actually it should only be a coward if it is not defined.
Moreover this is the default behavior of the DBIx::Class find method.
Test plan:
prove t/db_dependent/Koha/Objects.t
should return green
and
GET /cgi-bin/koha/authorities/authorities.pl
should not make everything explode.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Find this after signing 15470 :)
Test pass, new auth (Default) created, no errors.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 6cf157f9930fc1deb47da2d5c3b7f3abc3e7e3c4) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
Jonathan Druart [Tue, 5 Jan 2016 09:39:32 +0000 (09:39 +0000)]
Bug 15466: Do not assume $values_in is a hashref
It could be undefined.
Test plan:
prove t/db_dependent/Suggestions.t
should return green.
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 8235cbb0d4b614beb69df2041bb10484e38f3ada) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
Jonathan Druart [Wed, 6 Jan 2016 16:17:10 +0000 (16:17 +0000)]
Bug 15493: Use the correct CSV profile when exporting records from the export tool
The CSV profile used is not the one the user has chosen, but the one
defined in the pref ExportWithCsvProfile.
It's caused by a wrong variable name csv_profile vs csv_profile_id
Test plan:
Define 1+ csv profiles
Set ExportWithCsvProfile with 1 of these profile
Use the export tool to export some records using a csv profile.
Without this patch, the csv profile used, will always be the one defined
in ExportWithCsvProfile.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as descrived
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 47e6df5fe4bbf54517d47da4f1d49eb177732144) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Thu, 31 Dec 2015 11:11:51 +0000 (11:11 +0000)]
Bug 15453: Assign the correct shelfid to the download list links
Introduced by bug 14544, the shelfnumber is not correctly passed to the
template.
The shelf variable is passed to the template, to access the shelfnumber,
we need to get shelf.shelfnumber.
Test plan:
At the intranet, try to download a list.
Without this patch it won't work.
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 b6ded944331173b38b81fefc817293eecd9b4672) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
(cherry picked from commit e2a3b93860740fd498baad35fc8a4dc859527cb9) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
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>
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!
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 5c581ccdd0a2fc3ea49d941f2860ac1dd9953007) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
Kyle M Hall [Wed, 30 Dec 2015 18:55:33 +0000 (18:55 +0000)]
Bug 15447 - log4perl.conf does not have __LOG_DIR__ replaced when installing
Since the introduction of Koha::Logger, it appears that the
log4perl.conf config file has been broken. The references to __LOG_DIR__
is not being replaced.
Test Plan:
1) Apply this patch
2) Run 'perl Makefile.PL'
3) Run 'make'
4) Open blib/KOHA_CONF_DIR/log4perl.conf with a text editor
5) Note the log file paths are correctly set, and do not have
__LOG_DIR__ in them.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 30f5b7b0a62e243ce06f896c15b2689ac57706eb) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Kyle M Hall [Thu, 31 Dec 2015 11:23:42 +0000 (11:23 +0000)]
Bug 15383 [QA Followup] - Change language used
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 58699d77e75dbbf955aa5f28f0ac489539fabe49) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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:"?
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3d3c53ec017b6973e2cf1b27830c67fac95c7724) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Frédéric Demians [Thu, 26 Nov 2015 06:30:42 +0000 (07:30 +0100)]
Bug 15258: Prevent unused declared variables
Add a perlcritic rule to 00-perlcritic.t to prevent unused declared
variable.
TO TEST:
- Apply the 1st patch (unit test)
- Run the UT:
prove -v t/00-testcritic.t
- Note that several Perl script fail
- Apply the 2nd patch
- Run the UT, and confirm it passes.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
All tests pass successful.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit c7ec79b8390817100b677530b88d1d4d02986b98) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
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>
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>
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>
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.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c92b1556ef9250d7e038dce2d083c60415035b95) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
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>
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>
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.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3d7bb7647dd42f9c05e8b4c35ec32cd15ec4dcc4) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
Marc Véron [Wed, 16 Dec 2015 15:00:15 +0000 (16:00 +0100)]
Bug 15386: Checkout / patron pages: Hide menu items leading to 404 pages
Some of the menu items on patron / Checkout related pages lead to a 404 page
depending on the permissions. This patch hides them as appropriate.
To test:
- For a staff member A, set permission 'borrowers' only (+ 'catalogue')
- Log in as A
- Search a patron and display details
- Verify that none of the menu items at the left lead to the 404 page
- For a staff member B, set permission 'circulate_remaining_permission'
only (+ catalogue)
- Log in as B
- Go to Circulation > Checkout, search a patron
- Click menu items at the left, some of them lead to the 404 page
- Verify that none of the menu items at the left lead to the 404 page
- Do the same for a staff member C with both permissions set
- Verify that menu items appear as expected
Signed-off-by: Lucio Moraes <lmoraes@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch: I have remove the double if
CAN_user_circulate_circulate_remaining_permissions statement (and group
block into one). And also remove unecessary change ('IF a IF b' instead
of existing 'IF a && b')
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 976d715ac52a3c54cbc397d22127e773f977e0db) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
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>
Katrin Fischer [Wed, 25 Nov 2015 17:00:33 +0000 (18:00 +0100)]
Bug 14636: Follow-up - fix typo in system preference name
The preference is named "marcflavour" not "marcflavor".
Without this change, search will always use "copyrightyear"
and break search by publication date for 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 99a1d7f18a43a089d49d36b167cc1537fa058f79) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Fridolin Somers [Wed, 25 Nov 2015 16:06:01 +0000 (17:06 +0100)]
Bug 14636: Item search - biblioitems column is publicationyear not publicationdate
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Thx for the follow-up!
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 2d0d71730163fbd13583532de622574737e34221) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
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>
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>
Gaetan Boisson [Fri, 9 Oct 2015 12:44:44 +0000 (14:44 +0200)]
BUG 14991 Improve consistency of authority search
At the moment we can search authorities from two places: authorities-home.pl and auth_finder.pl (while cataloguing).
The auth_finder.pl page offers searching specifically in the $a of the main heading, while the authorities home page doesn't.
Additionally, the wording and order of the options is different.
authorities-home.pl has:
Search main heading
Search all headings
Keyword search
while auth_finder.pl has:
Main entry ($a only)
Main entry
Anywhere
Heading match
This patch will add some consistency so that both pages offer:
Search main heading ($a only)
Search main heading
Search all headings
Search entire record
Test plan:
- apply patch
- go to authorities home
- check that previous searches are still working
- check that the new ($a only) search is working
- go to auth finder (from cataloguing)
- check that searches are still working
- check that we do have the same wording in both pages and that forms are now consistent
Signed-off-by: Aleisha <aleishaamohia@hotmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 4d96477544341d46da64973cfd0b96b4debaa3a7) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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.
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 825d68ee8696a2c3f3a2a95c0d148015f02a5ae9) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
Jonathan Druart [Tue, 8 Dec 2015 15:10:46 +0000 (15:10 +0000)]
Bug 15324: Do not display 'Waiting holds:" if no holds are waiting
Test plan:
- Make sure that you have a patron A with waiting holds and a patron B
without waiting holds
- Go to the checkout page for patron A (Home > Circulation > Checkouts
> ...)
- At the right, there is a title "Waiting holds:" and a list of
holds waiting
- Go to the checkout page for patron B
=> Without this patch "Waiting holds:" is displayed
Sign-off on Jonathan's patch Signed-off-by: Marc Véron <veron@veron.ch>
http://bugs.koha-community.org/show_bug.cgi?id=14324
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit cd46c5dc75f9381d4766b0bd70b3d089e53e539b) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
Kyle M Hall [Fri, 18 Dec 2015 17:32:31 +0000 (17:32 +0000)]
Bug 15289 [QA Followup] - Fix minor language issue
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 881433043903ead9d37a434342e3b998bc86c17b) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Alex Arnaud [Tue, 15 Dec 2015 13:11:54 +0000 (14:11 +0100)]
Bug 15289 - borrowers permission allows to see patron's loans
Test plan:
- log with a user that have "borrowers" permission but not "Remaining circulation permissions"
- go to a borrower's detail page (who has at least a loan) and click on "show checkouts"
- check that you see loan(s) and that you can't renew and checkin
- Do the same with a borrower that have "Remaining circulation permissions"
- check that you see loan(s) and that you can renew and checkin
Followed test plan. 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 A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit eb5fca30aa7005afaa34d394e1115eead969271b) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
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>
This patch removes the \n\n from a translatable string
as those don't translate correctly to new lines.
It also switches 'item' for 'patron' to avoid confusion
with catalog items.
To test:
1) Trigger changed error message
- Create a new batch with 1 patron entry
- Select patron in list using the checkbox
- Click 'Remove selected patrons' in toolbar
- Verify alert displays correctly
2) Verify that the page no longer uses "items" but
patrons instead.
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 5782da035f736765dceced4b2db9699b30e22017) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Jonathan Druart [Wed, 25 Nov 2015 16:45:50 +0000 (16:45 +0000)]
Bug 15101: Correct typo AllowPkiAuth vs AllowPKIAuth
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit d36280e36e1fa8779bf845fb0cc0de2ea835d486) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
Jonathan Druart [Wed, 25 Nov 2015 16:14:35 +0000 (16:14 +0000)]
Bug 15229: Same fix for circulation.tt template (normal checkouts)
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit acf586a45ab4a27939f0ba34cba58ae8ff500993) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Katrin Fischer [Sun, 22 Nov 2015 00:48:31 +0000 (01:48 +0100)]
Bug 15229: Fix tiny typos in error messages of batch checkout page
Patch fixes some small spelling errors on the batch checkouts
page. Also switches 'reserves' to 'holds'.
To test:
- Read the patch and verify that the changes are correct.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Changes are correct, patch fixes capitalization and typo
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 59e2b4e105b1f5c55b97665fce44bccd58f0c7a1) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Nicole C. Engard [Thu, 19 Nov 2015 15:31:01 +0000 (09:31 -0600)]
Bug 15220: Fix typo in circ rules help
MaxFinesystem should be MaxFine system
To test:
* visit circ & fine rules
* click help
* confirm typo fixed
Signed-off-by: Thomas Misilo <misilot@fit.edu> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 391c8ec0bc682491faaf64494867237dfc01bd11) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
Marc Véron [Sat, 21 Nov 2015 02:09:55 +0000 (03:09 +0100)]
Bug 15237: Quote of the day: Better translatibility for editor and help
This patch moves html markup out of explanatory text in Quote of the day editor and help
for better translatibility (Home > Tools > Quote Editor).
To test:
- Apply patch
- Go to Home > Tools > Quote Editor and related Help
- Verify that text changes make 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>
Amended patch: Make consistent space after "Note:" (inside the br tag)
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit b0e833f9f5bffeb0940dd75eae150a247b5b520c) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
This patch makes
koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc to comply with
Coding guidlines to avoid translation issues: "JS3: Avoid strings which
mix text and markup Text mustn't contain HTML tags."
To test:
- Apply patch
- Verify that code changes are correct (html markup moved out of
function _(...) )
- Bonus test: Enable syspref 'EnableAdvancedCatalogingEditor' and verify
that it works as before
With type fix from: Hector Castro <hector.hecaxmmx@gmail.com>
Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 36c06583298649843309a4fc8696b1c638e16740) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 5843c76546d5769493099faed2fbce39fbe3b6f3) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
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>
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>
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>
Marc Véron [Sun, 13 Dec 2015 10:58:52 +0000 (11:58 +0100)]
Bug 15363: Translatability: Fix issue with ambiguous 'all' on Administration > Set library checkin and transfer policy
In branch_transfer_limits.tt, set ambiguous word 'all' (separated by tags) into a
translatable context.
To test:
Apply patch
- Go to Home > Administration > Set library checkin and transfer policy
- Verify that the word 'all' is no longer separated by tags
in "For all collection codes: " rsp. "For all item types: "
(Switch with syspref 'BranchTransfersLimitsType')
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works well for translation purpose
Bug 15363: (followup) Move tags inside if statements
Followup for comment #3
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 27363271be4b4cc308572dcf04049edf33fa1a7c) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marc Véron [Sun, 13 Dec 2015 09:47:53 +0000 (10:47 +0100)]
Bug 15362: Translatability: Fix issue on Administration 'Did you mean?'
Fix sentence splitting by tags on didyoumean.tt leading to odd translations.
To test:
- Apply patch
- Go to Home > Administration > Did you mean?
- Verify that the information below the title displays properly and makes sense.
- Disable Javascript, reload page
- Verify that the warning about missing Javascript displays properly and makes sense.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as descrived. Removed em tags 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 984f641417e20ab561b2670b5ed921dc4aa6a907) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marc Véron [Sun, 13 Dec 2015 09:08:41 +0000 (10:08 +0100)]
Bug 15361: Translatability: Fix issue on Administration Columns settings
This patch rewords the following sentence that is not correctly translatable due to
splitting b tags:
Changes made below will only apply to item subfields that are mapped to the items table.
To test:
- Apply patch
- Verify that the rewording makes sese and that no sentences are split by tags.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Rewording message 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 4983d5c4b9786479f849494efd3048f65ba26008) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marc Véron [Wed, 9 Dec 2015 20:31:29 +0000 (21:31 +0100)]
Bug 15346: Translatability: fix sentence splitting issue in memberentrygen.tt
Fix sentences in memberentrygen.tt that are split by <strong> tags, leading to
wrong capitalization in German (because it can not be decided if a string is part
of a sentence or a standalone sentence).
Example: Es sind Keine Bibliotheken definiert.
To test:
- Apply patch
- To trigger the messages, you have to edit a patron in a system where
no libraries and no patron categories are defined
- Alternatively, carefully review the changes in
koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Sentences fixed 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 698fb010f55c0d68789299003f4ac55326142f72) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marc Véron [Wed, 9 Dec 2015 17:36:21 +0000 (18:36 +0100)]
Bug 15345: Translatability: fix issue in facets (Availability')
This patch fixes an issue with a splitted sentence in facets (Avalability)
that leads to weird translations e.g.:
German: 'Zeige nur Verfügbar Exemplare'
French: 'Montrer seulement disponible exemplaires'
Additionally, the link "Show all items" gets it's own li tags to display
nicely like the other links in the facets column and it removes superfluous
dots.
To test in OPAC and Staff client:
- Apply patch
- Do a search that results in more than one available items
- In column "Refine your search", click on "Limit to currently available
items"
- Verify that the message "Showing only available items" and the link
"Show all items" display nicely.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
use_zebra_facets set to 0 in koha-conf.xml to test. Works as described
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 5e80a64ea39140c9918335fc472a441bb3fa9c6a) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Liz Rea [Fri, 20 Nov 2015 02:08:25 +0000 (15:08 +1300)]
Bug 15223 - fix buttons on patron lists
To test:
go to tools -> patron lists
notice that the buttons are not misaligned anymore
You may need to force refresh the page to see the original issue, and to see it fixed.
With patch buttons display nicely. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit dba72d903deb525250bfb8b633b88e2aa7b1b962) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marc Véron [Fri, 20 Nov 2015 18:05:02 +0000 (19:05 +0100)]
Bug 15230: Remove unused file circ/stats.pl and stats.tt from system
This patch removes stats.pl and stats.tt from system.
To test:
- Verify that both files are not used and that the only reference in
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
is commented out.
- Apply patch
- Verify that the files are deleted and the reference is removed.
- git grep 'stats.pl', verify that there are no more references to
this file.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
See the following commit for more info on this script:
commit 60105bd692a07639f275543365acfca4f464c1a2
Date: Tue Jul 8 20:02:34 2008 -0500
fix for 2008: Daily reconciliation report broken
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 186b4b7e091a60a8914eca2a6a7550b12c430c69) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Kyle M Hall [Mon, 20 Apr 2015 19:31:11 +0000 (12:31 -0700)]
Bug 13838 - Redirect to 'expired holds' tab after cancelling a hold
When canceling a hold from the holds over tab, you are redirected back to the holds waiting tab. Instead, we should the librarian should continue to see the list of holds past the waiting length.
Test Plan:
1) Apply this patch
2) Cancel a hold from the "Holds over" tab on circ/waitingreserves.pl
3) Note you are redirected back to the holds over tab
Signed-off-by: Tom Misilo <misilot@fit.edu> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 353e30d73e261a96077917004036c2c01e32c623) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Fridolin Somers [Mon, 16 Nov 2015 12:07:07 +0000 (13:07 +0100)]
Bug 15193 - Perl scripts missing exec permission
Some perl scripts have 644 permissions instead of 755.
I think some are special like install-CPAN.pl.
This patch corrects some common perl scripts.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.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 3410608b66fe0dd6e4c94fdcc185c7fb89b619c1) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
This patch removes a limit in RIS.pm print_isbn sub.
To test:
1) Find in opac a book with an isbn with length(isbn) > 10
(with dashes or isbn13)
2) Export record to RIS format, check truncated SN field
in exported file
3) Apply the patch
4) Export again, no more truncation
Signed-off-by: jvr <jvr@fct.unl.pt> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 906d2108b9054a68168219136d69e6d783f156fb) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Katrin Fischer [Sun, 22 Nov 2015 01:31:10 +0000 (02:31 +0100)]
Bug 15202: Fix date display when transferring an order
The date a basket was created was not displayed
according to the dateformat system preference.
Also fixes wording of the message shown when there
are no baskets for a chosen vendor.
To test:
- Create an order with an order line
- Click on the "Transfer" link on the basket
summary page
- Search for a vendor without open baskets
- Verify change of message shown:
"There are no open baskets for this vendor."
- Choose another vendor with open baskets
- Verify the creation date of the basket is
displayed correctly formatted.
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>
(cherry picked from commit f4b8c4ede9c83b1b78eb87c7fb31214299cbf2f2) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Bug 14846 - Items with no holdingbranch causes svc/holds to crash
When trying to display the holds for a user, if an item has no
holdingbranch, it causes the svc/holds service to crash and the display
to freeze.
Tentative steps to reproduce on any DB:
1) put 1 or more items on hold for a given user.
2) go into the database and set the item.holdingbranch to NULL
3) In the user's page, in checkouts (circulation.pl), click the tab that
should be written 1 Hold(s)
4) It will be "Processing" indefinitely.
The cause is the svc/holds code that crashes. The fix will validate
that there's an holdingbranch before proceding with the code.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c6f7496422a593fdfe4dd2633aed4b190703d03d) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Julian Maurice [Mon, 7 Dec 2015 14:25:25 +0000 (15:25 +0100)]
Bug 15325: Fix --table option of rebuild_zebra.pl
Option's value given on command line was never used and 'biblioitems'
was used instead.
Test plan:
1. git checkout master
2. perl misc/migration_tools/rebuild_zebra.pl -b -t items --where "price = 42"
3. You should see errors printed on screen about an unknown column
4. Apply patch
5. perl misc/migration_tools/rebuild_zebra.pl -b -t items --where "price = 42"
6. No errors \o/
Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 48df0b8a2d50a0a4b9a17efd5e0711425ed5e09e) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marc Véron [Tue, 1 Dec 2015 19:22:27 +0000 (20:22 +0100)]
Bug 15244: t/db_dependent/Reserves.t depends on external data/configuration
Test 14 in t/db_dependent/Reserves.t fails if syspref LocalHoldsPriority is
set to "[Give] priority for filling holds to patrons whose...
To verify:
- Set syspref as above and run test. Test 14 fails.
- Set syspref to [Don't give] and run test agein, it passes OK.
To test:
- Apply patch
- Run test again with syspref set / not set
Expected result: In both cases test should pass
(AMended to change bug title)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit ae5962cab435fe5119cf743a2ea0b9e501985ff9) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Katrin Fischer [Wed, 25 Nov 2015 23:29:34 +0000 (00:29 +0100)]
Bug 15216: Returns - Show collection description
The table of returns displays the collection code
instead of the description. This patch fixes that.
Same as first patch:
To test:
- Check out some items
- Return the items
- Verify the changes in the table of returned items
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 a102ccd48f72327d8d84d3782259b1417b75336b) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Katrin Fischer [Sun, 22 Nov 2015 01:23:11 +0000 (02:23 +0100)]
Bug 15216: Returns - Show branch names and item type description
Changes the table with returned items to display the branch
names for home and holding branch and the itemtype description
instead of the codes.
To test:
- Check out some items
- Return the items
- Verify the changes in the table of returned items
Signed-off-by: Nick Clemens <nick@bywatersolutions.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 84a0f1acf6ef052cc83eb4c0f6c07127b4cfaae2) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Bug 11038: Enable use of IntranetUserCSS on staff client login page
This patch enable use of IntranetUserCss on staff client
login page.
To test:
1) Add something to IntranetUserCSS to modify login page,
for example
#login h1 a {
height:30px;
}
2) Logout from staff client, no changes on login page.
3) Apply the patch
4) Reload, now logo is cut in half :)
Bonus) Login again an try changing image, add
#login h1 {
background: url(http://example.com/img/other-logo.png) no-repeat top center;
}
and fix height. Logout and check
This also affects 3.20 and perhaps earlier versions.
Re-upload to fix examples
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 11e4c42e05090a25bf9fa03275f708d1f1c4fde7) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Katrin Fischer [Sun, 22 Nov 2015 00:18:04 +0000 (01:18 +0100)]
Bug 9184: Acq - Don't show authority batches when ordering from staged file
When ordering from a staged file, the list of files
should only include imports of bilbiographic and
no authority data.
To test - start without the patch:
1) Stage an authority file
2) Stage a bilbiographic file
3) Create a new basked in acquisitions
4) Create a new order line selecting "From a staged file"
5) Verify that both files are shown
6) Apply patch
7) Verify that only the bibliographc file shows
in the list now
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: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 169015af947e52895e784375c4c654c110c7f1a9) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Fridolin Somers [Mon, 23 Nov 2015 08:19:06 +0000 (09:19 +0100)]
Bug 14599 - Saved auth login and password are used in patron creation from
If one save the login and password used to authenticate in staff interface, when creating a new patron, those login and password are filled in the corresponding inputs in the form.
This behaviour is awkward from web browser.
A trick is provided by http://stackoverflow.com/questions/10738090/why-firefox-autocomplete-even-with-different-input-name
I found that the best way is to use an hidden disabled input between userid and password.
Test plan :
- Log into Koha
- Allow the browser to save the userid/password
- Be sure that you have only one userid/password for this Koha
- Loggout
- Re log to check the browser autocomplets the authentication form
- Create a new patron
=> Without patch your saved userid/password have been added to the form
=> With patch your saved userid/password have not been added to the form
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This is not elegant but it works.
Note that the problem does not exist with Chromium
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f4870f6666127f0f0b2c49cc4f89cadd0241a8b9) Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
projects / koha.git / log