Mason James [Wed, 26 Nov 2014 00:51:45 +0000 (13:51 +1300)]
Bug 13331 Subfield does not show in cataloging editor - if subfield is disabled in OPAC/enabled in Staff, via frameworks
to test...
1/ attempt to add a new bib in the cataloguing editor, default framewok
- observe 245b subfield is visible in the editor, for tab 2
2/ uncheck the OPAC visibility for 245b, within the framework editor - then save
3/ repeat step 1/
- observe that the 245b subfield has disappeared from the cataloguing editor!
4/ apply patch,
5/ repeat step 1/
- observe that the 245b subfield now displays correctly in the cataloguing editor
note: this looks looks like a typo bug, that has been in koha for years
Signed-off-by: wajasu <matted@34813.mypacks.net> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit a42954627ec129e47ebc47d36cf87d33617bd808) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 13355: System preferences tab value wrong in templates
This patch fixes a bug on the system preferences tab templates.
To test:
To reproduce:
(1)
- Choose a tab on the sysprefs section (for example 'Enhanced Content')
- Right click on 'Enhanced Content preferences' title, and choose to 'inspect' the code
=> FAIL: you will see below the form tag something like:
<input type="hidden" name="op" value="save">
<input type="hidden" name="tab" value="">
(2)
- Do a syspref search (for example 'facet').
- Right click on one of the category titles (for example 'OPAC preferences')
=> FAIL: you will see below the form tag something like:
<input type="hidden" name="op" value="save">
<input type="hidden" name="tab" value="HASH(0x6e53050)">
- Apply the patch
- Repeat (1) and (2)
=> SUCCESS: you will see below the form tag something like:
<input type="hidden" name="tab" value="enhanced_content">
and
<input type="hidden" name="tab" value="opac">
respectively.
- Sign off :-D
Regards
Signed-off-by: wajasu <matted@34813.mypacks.net> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 84fbded3645a85c507afaab4dff42396a3974e47) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Sat, 29 Nov 2014 10:41:50 +0000 (11:41 +0100)]
Bug 10051: Separate first name and surname with comma in overdues report
The name of the patron who has overdues is displayed as
"surname first name" instead of "surname, first name".
To test:
- Go to circulation > overdues
- Verify that first name and surname are not separated by comma
- Apply patch
- Verify the display is improved with a comma
- Delete the first name from one of the patrons
- Verify display is still ok
Signed-off-by: David Roberts <david.roberts@ptfs-europe.com> Signed-off-by: Christopher Brannon <cbrannon@debian.localdomain> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit a88a3d04aba8baa58fbde846a57eb5baa0eb9d10) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Sun, 30 Nov 2014 07:10:48 +0000 (08:10 +0100)]
Bug 11706: Typo fix for "efault" in old database update
To test:
- Verify the typo has been correct and no other changes
have been made
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Typo fixed, no koha-qa errors.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 566b2689d0946c0583096661e34c983836218e31) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 13362: translate script creates dirs on update
A dir creation was uncommented (by me), the effect is
create a lang dir on 'update', which is no needed.
To test:
1) Update translation files for a uninstalled language
(cd misc/translator; ./translate update xx-YY)
2) Check new dirs
koha-tmpl/opac-tmpl/bootstrap/xx-YY/
koha-tmpl/intranet-tmpl/prog/xx-YY/
koha-tmpl/intranet-tmpl/prog/en/modules/help/xx-YY/
3) Clean all
git clean -f -d
4) Apply the patch
5) Repeat 1) (i.e. update)
6) Check no new dirs this time
Signed-off-by: Frederic Demians <f.demians@tamil.fr> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested according to test plan, works as described.
Passes tests and QA script.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 0edebb12b4aa9bb0532eb574aaaeee201a61f595) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Wed, 3 Dec 2014 13:36:04 +0000 (08:36 -0500)]
Bug 13375: Syspref search highlight styling broken in Chrome
This patch encloses the the syspref description/values mix in a <div>.
It doesn't introduce any regression on other browsers (like Firefox) and
has the side effect to make Chrome render the highlighted words on
syspref searches well.
This alternate patch uses a <div> instead of a <span> because it will
sometimes contain block-level elements. Follow the same plan:
To test:
- Search for 'facet' on the sysprefs
=> FAIL: verify it has styling problems in Chrome
- Apply the patch, reload
=> SUCCESS: styling is correct
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 6c23ef54a32bbdfcc04e59b96ae9936240c46e41) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Martin Renvoize [Tue, 16 Dec 2014 17:15:58 +0000 (17:15 +0000)]
BUG 13468: Overdue notice lists all checked out books
This patch should fix the issue when running under 'triggered' mode
To test:
1) Run overdue_notices.pl -t -n [to output notices to command
line]
2) Note that the notices output, list ALL checked out items
3) Apply Patch
4) Run again
5) Note the difference
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: remove space changes.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 6413eb9949956b899d4049bf53cb5a6dff15154f) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Mark Tompsett [Fri, 12 Dec 2014 16:51:38 +0000 (11:51 -0500)]
Bug 13451: Holidays.t assumes default data
This patch removes that assumption by expressly setting data
to be default.
TEST PLAN
---------
1) Ensure that branch code is NOT 'MPL' in the
repeatable_holidays table in your database.
2) Ensure that branch codes 'MPL' and 'CPL' do not exist
in the branches table in your database.
3) prove t/db_dependent/Holidays.t
-- this should bomb horribly.
4) Apply patch
5) prove t/db_dependent/Holidays.t
-- all tests should succeed.
6) run koha qa tests
Signed-off-by: Nick Clemens <nick@quecheelibrary.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tests pass without holidays in the calendar.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit d37dee3ddf97a028cc42ef15fd9f938d9b7bd89a) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 13398: rotating collections scripts are skipped on install
This patch makes the Makefile.PL script pick the rotating_collections/
directory for install.
To test:
- Run:
$ perl Makefile.PL
- Install using either 'standard' or 'single' method.
=> FAIL: Verify that there is no 'rotating_collections' directory
on the intranet CGI direcory.
- Apply the patch
- Run:
$ perl Makefile.PL
- Install using either 'standard' or 'single' method.
=> SUCCESS: Verify that there is a 'rotating_collections' directory
on the intranet CGI direcory.
- Sign off :-D
Regards
Tomas
PS1: Note that it should be enough to check for the rotating_collections files
on the generated Makefile after 'perl Makefile.PL'.
PS2: The packages use the 'standard' install method to generate the file tree.
So this patch should fix the packages too.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 99f3121ff874fdc38aa607ca0db5b16436dd16ca) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Jonathan Druart [Wed, 10 Dec 2014 08:38:12 +0000 (09:38 +0100)]
Bug 13428: Fix regression on deleting facets
Test plan:
Search for something
click on a facet with diacritic
click on another facet
remove the facet with diacritic
Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 1c3b98e146df0cdd1976c6bf51840ac2103b24cf) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Tue, 9 Dec 2014 23:47:30 +0000 (12:47 +1300)]
Bug 13425 - XSS in opac facets - Patch for master and 3.18
To Test
1/ Craft a url like /cgi-bin/koha/opac-search.pl?q=123&sort_by='"><script>prompt('Happy_Holidays')</script>&limit=123
It is important it must return results and facets
2/ Notice the js is executed
3/ Apply the patch test again
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Popup is gone after applying the patch. Facet link still shows it but does not execute. It's gone after clicking the link. Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
<p>Thank you for visiting the <<branches.branchname>> of HMCPL.</p>
2) Check out some items to a patron
3) View the patrn's notices
4) Note the notice viewer is broken ( message is not collapsed, and
con't be collapsed ).
5) Apply this patch
6) Reload the page
7) Note the notice viewer is no longer broken
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
This patch appears to fix the problem with the minimum required change.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Passes tests and QA script.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit ab2d2d2590fe4adf4adf6015f0ef441da8ad52a3) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Jonathan Druart [Tue, 23 Sep 2014 10:39:55 +0000 (12:39 +0200)]
Bug 12852: C4::Bookseller should not be imported anymore
This script does not depend on C4::Bookseller anymore. The import can be
removed.
Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 4179c63d7ea1a087b725b0a8da98537aa1d61949) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Jonathan Druart [Tue, 9 Sep 2014 13:22:35 +0000 (15:22 +0200)]
Bug 12852: Some unused stuffs more
These parameters are never used.
GetBookSeller takes a string (bookseller name) in parameter, not an id!
Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 66438d59e7268a06278ed29a5304a7a31cd0e67f) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Jonathan Druart [Fri, 29 Aug 2014 13:16:19 +0000 (15:16 +0200)]
Bug 12852: The "preview" param can be removed serials/claims.pl
This case (preview=1) never appened. This patch remove all occurrences
in the pl and the tt files.
Test plan:
Verify you don't manage to find a place where preview is set to 1 on the
claim serials page.
Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit fd38d8c565ce3efe21b2633f67f7349db28faddd) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Jonathan Druart [Tue, 23 Sep 2014 11:02:51 +0000 (13:02 +0200)]
Bug 12980: GetHistory does useless processing
GetHistory iterated on the orders to calculate the quantity and price.
These values are never used by the called.
It can be removed.
Test plan:
Verify there is no regression on acqui/histsearch.pl and
catalogue/detail.pl
Actually you just have to check that the total quantity and price are
not displayed on these views.
QA: note that 'count' and 'toggle' are never used in the template.
Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 46e3f8169c026ed9037f38669c5742e912326339) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Jonathan Druart [Tue, 26 Aug 2014 08:50:22 +0000 (10:50 +0200)]
Bug 12841: aqorders fields should not be mapped
Bug 5336 introduced some code which should have been introduced by bug
7294.
Since the idea behind bug 7294 has been abandoned (map the aqorders
fields), the code can be removed.
Test plan:
Verify that Koha does not allow you to map the aqorders fields with a
MARC subfield.
Verify there is no regression on adding/updating an order.
Signed-off-by: Zeno Tajoli <z.tajoli@cineca.it> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit b449b08d91c536c3ec8a4b87e6c14d460f59878a) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Jonathan Druart [Tue, 26 Aug 2014 10:46:52 +0000 (12:46 +0200)]
Bug 12839: aqbooksellers.gstreg is never used
The aqbooksellers.gstreg is never used in the code.
This patch does not remove the DB field but 3 useless occurrences in the
neworderempty page.
The both variable applygst and gstreg have never been took into account for prices calculation.
Test plan:
Verify there is no difference before and after the patch in the prices
calculation.
Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit d311722445f5d887e1054be2d1c99128f3b8207d) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Robin Sheat [Wed, 3 Dec 2014 03:28:10 +0000 (16:28 +1300)]
Bug 13377: mark automatic_renewals.pl as executable
This script is called by a cron job, but was never marked as executable,
so will error every time it's called, which is no good. This also adds
an appropriate #! line to the top of the file.
To test:
* apply the patch
* make a package
* ensure that the installed
/usr/share/koha/bin/cronjobs/automatic_renewals.pl
is mode 755 and does something when run.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit a8c975d951694a80b73cd1f66e9a9095db2f484d) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Mon, 10 Nov 2014 21:30:16 +0000 (22:30 +0100)]
Bug 12567: Make catalog statistics wizard publication year work for MARC21
Publication year was useless for MARC21, as it was using the
biblioitems.publicationyear (UNIMARC) instead of biblio.copyrightdate
(MARC21).
This patch tries to fix the search options to work for both MARC
flavours.
To test:
In Reports > Statistics wizards > Catalog:
- Test the publication year search options on a UNIMARC and
a MARC21 installation.
- Make sure search results make sense for both.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
The changes are fine with me, but this script is certainly not bug free.
Also note that all its SQL should be moved out according to our
coding guidelines. When doing so, a rewrite would be appropriate.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 865996d097bbc4cc36fdb5231bacfaed822cfd54) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Robin Sheat [Thu, 27 Nov 2014 23:24:21 +0000 (12:24 +1300)]
Bug 13359 - allow the packages to use virtual-mysql-*
Prior to this patch, the koha packages depended on mysql-client. This
meant that it was tricky to use things such as the MariaDB libraries
instead.
This patch recommends mysql, but will accept mariadb and other things
that are marked by debian as able to replace mysql.
Signed-off-by: wajasu <matted@34813.mypacks.net> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 9419177a1e39296fe1049b44fb9788eeb4341b77) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Martin Renvoize [Thu, 27 Nov 2014 15:31:24 +0000 (15:31 +0000)]
Bug 9165: (Followup) Tidied code slightly
Minor code tidy to clean up qa script warning.
http://bugs.koha-community.org/show_bug.cgi?id=9165 Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Martin Renvoize [Mon, 24 Nov 2014 16:27:41 +0000 (16:27 +0000)]
Bug 9165: (Followup) Clear existing sync
A small enhancement to clear existing synced passowrd should this
config option be enbled. This followup is related to bug 12831
http://bugs.koha-community.org/show_bug.cgi?id=9165 Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Robin Sheat [Thu, 29 Nov 2012 01:25:30 +0000 (14:25 +1300)]
Bug 9165: Prevent LDAP passwords being stored locally
This adds a configuration option to LDAP that prevents it from storing
user's passwords in the local database. This is useful when users of
hosted Koha wish to prevent any form of offsite password storage for
security reasons.
Notes:
* if the option is not included in the koha-conf.xml file, then the
current default behaviour of saving the password locally is retained.
* this has no impact on passwords that are already in the database.
They will not be erased.
To use:
* edit the koha-conf.xml for a system that uses LDAP for
authentication.
* in the <ldapserver> configuration, add:
<update_password>0</update_password>
* feel a greater sense of security.
To test:
1) have a Koha system that authenticates using LDAP.
2) note that when a user logs in, their password is saved (hashed) in
the database.
2.5) it is important to note that, for whatever reason, a user's
password is not stored on a login where their account is created,
only when they log in after being created. Thus perhaps log in and
log out a couple of times to be sure.
3) add the <update_password>0</update_password> option to the
<ldapserver> section of koha-conf.xml.
4) login with a new user (or erase the password from the database for
an existing user) and note that the password field is not populated.
5) log out and log back in just to be sure, check the password field
again.
Sponsored-By: National Institute of Water and Atmospheric Research (NIWA) Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Martin Renvoize [Mon, 24 Nov 2014 16:07:58 +0000 (16:07 +0000)]
Bug 12831: Local Only logins with LDAP
Local only logins should continue to function when LDAP is enabled.
This was not the case after bug 8148 [LDAP Auth should FAIL when ldap
contains a NEW password]. For this case, we need to diferentiate
between local accounts and ldap accounts. This is somewhat challenging
and thus this patch is only part of the story.
The other half can be achieved with bug 9165
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
checkpw_ldap should return 0 if it is not an anonymous bind, and authentication
fails. This is better explained on the bug comments. This is just a regression
test for the revised functionality.
To test:
- Run
$ prove t/db_dependent/Auth_with_ldap.t
=> FAIL: it fails because C4::Auth_with_ldap doesn't match the expected behaviour
- Apply the bugfix from Martin
- Run
$ prove t/db_dependent/Auth_with_ldap.t
=> SUCCESS: tests now pass.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Jonathan Druart [Fri, 21 Nov 2014 15:13:41 +0000 (16:13 +0100)]
Bug 13215: (follow-up) Fix notice edition
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Jonathan Druart [Fri, 21 Nov 2014 09:28:02 +0000 (10:28 +0100)]
Bug 13215: Fix notice deletion
This patch could have only been
- name => $values[0]->{name},
+ name => $letter->{name},
Other changes are just indentation and variable names (send an hashref
$letter to the template and use the Branches TT plugin to display the
branch name)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Jonathan Druart [Fri, 21 Nov 2014 09:24:07 +0000 (10:24 +0100)]
Bug 13215: Fix notice edition
C4::Letters::getletter does not set mtt in value ( i.e. { email => "my
email notice} ) at the contrary of the get_letter routine defined in
tools/letters.pl.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Jonathan Druart [Thu, 6 Nov 2014 15:02:08 +0000 (16:02 +0100)]
Bug 13215: The same letter code can be used for several libraries
This patch fixes a major issue introduced by the
commit 5c4fdcf Bug 11742: A letter code should be unique.
The interface should let the possibility to create a default template
letter and some specific ones, with the same letter code (letter.code).
The patches submitted on bug 11742 tried to fix an issue based on a
(very bad) assumption: letter.code should be considered as a primary key and
should be uniq.
This patch reintroduces this behavior.
Note that the interface will block a letter code used in different
module (this is consistent not to have the same letter code used for different
needs).
This patch is absolutely not perfect, it just tries to change as less
change as possible and to use new tested subroutines.
Test plan:
1/ Verify that the problem raised on bug 11742 does not appears anymore.
2/ Verify there are no regression on adding, editing, copying, deleting
letters.
3/ Verify you are allowed to create a default letter template with a letter
code and to reuse for a specific letter (i.e. for a given library).
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Liz Rea [Mon, 6 Oct 2014 20:35:19 +0000 (09:35 +1300)]
Bug 12856: koha-disable fails without disabling site
To test:
Package up a branch with this patch
install that package
create a site - sudo koha-create --create-db testdisable
enable a site - sudo koha-enable testdisable
check it's enabled - sudo koha-list --enabled
* it should show up
disable a site - sudo koha-disable testdisable
Do this for both debian squeeze/wheezy and ubuntu 12.04 and 14.04, if you can. I'd like to see a sign off from a debian (sq/wh)eez(e/y) or ubuntu 12 user, because I could only test reliably on ubuntu 14.04.
* make sure apache restarts and no errors are produced
check it's disabled - sudo koha-list --enabled
* it should not show up
check the site is still there - sudo koha-list
* it should still be there
check that the config file has the Include for disabling uncommented
* the line Include /etc/koha/apache-shared-disable.conf should not have a # in front.
Re-enable the site - sudo koha-enable testdisable
* the line Include /etc/koha/apache-shared-disable.conf should have a # in front.
And the final question - does the site work? All other functions unchanged?
Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Works as expected. code reads better too.
Edit: I added a missing space in one line.
Katrin Fischer [Sun, 23 Nov 2014 20:11:55 +0000 (21:11 +0100)]
Bug 13147: Update German web installer files for 3.18
- Adds translations for new permissions
- Adds ISO code to the sample currencies
- Removes a comment line about branchrelations from
sample_libraries (en)
To test:
- Run the German web installer with all sample data
selected
- Verify it runs without problems
- If you speak German - verify the translations make sense
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
No errors from the web installer. I verified that all the changes I saw
in the diff appeared correctly in the permissions. Currencies all
appeared to be correct after installation. Translations appeared to be
very German-looking.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Jonathan Druart [Tue, 25 Nov 2014 14:04:25 +0000 (15:04 +0100)]
Bug 13332: Fix conflict between 5304 and 10860
These 2 bugs are in conflict.
The first one always join the issue table, the second one join on this
table too if the OnSiteCheckouts pref is enable.
So DBI raises an error if the pref is enabled (2 joins on the same
table).
This patch removes the conditional join.
Test plan:
Go on a detail record page with items and verify that items are list and
that the error no more appears in the log file.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Reproduced the problem, the patch fixes it, no noticeable regression found.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, items are visible again.
Passes tests and QA script.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Jonathan Druart [Wed, 26 Nov 2014 11:39:22 +0000 (12:39 +0100)]
Bug 9043: Add a wonderful image
This patch adds the missing multiple-select.png image.
Test plan:
- search the pref 'advsearch'
- without this patch, you get a 404 error for the image
- with this patch, you don't get the error but a wonderful image on the
right of the "multiple" pref
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Marcel de Rooy [Wed, 26 Nov 2014 12:39:24 +0000 (13:39 +0100)]
Bug 13314: Follow-up for m.de.rooy in .mailmap
Email addresses in git seem to be case sensitive.
The list of shortlog -ns was good, but git shortlog -e still made a
difference.
Additionally, reworded initial comments slightly.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Kyle M Hall [Tue, 28 Oct 2014 12:12:46 +0000 (08:12 -0400)]
Bug 13152 - Duplicate phone hold notices when using Talking Tech
If a library is using Talking Tech for phone notices, any waiting hold
phone notice will show up twice!
This is because Koha generates on at the time the hold is set to
waiting, and then the cronjob TalkingTech_itiva_outbound.pl generates
it's own notice as well.
The former notice will always have a status of 'pending', as the
TalkingTech_itiva_inbound.pl script will update the notice the outbound
script created.
The solution is to prevent Koha from creating a phone notice for waiting
holds if TT is enabled, and let the cron script do it.
Test Plan:
1) Enable Talking Tech from the system preferences
2) Set a hold waiting phone notice in the notices and slips editor
3) Choose a patron, enable hold phone notices for that patron
4) Place a hold for a patron, and check it in so it's marked as waiting
5) Note the phone notice generated for the patron
6) Apply this patch
7) Repeat step 4
8) Note that this time, a phone hold waiting notice is not generated
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Amends condition with an additional or statement. Shoudn't affect
anything but phone notices. Change appears logical.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Jonathan Druart [Wed, 21 May 2014 08:18:38 +0000 (10:18 +0200)]
Bug 12298: The "feed" MTT does not seem to be used and can be removed
The feed message transport type exists but nobody knows how it can be
used. This patch assumes nobody uses it and removes it.
Before removing the entry in the DB, the updatedb entry will check if no
foreign key exists in order to avoid a delete in cascade.
This path does *not* deletes the occurrences in the templates.
Test plan:
Apply this patch, execute the updatedb script and verify the
message_transport_types table does not contain the 'feed' entry if it was not
in use.
Signed-off-by: Nick Clemens <nick@quecheelibrary.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch will remove the confusing option to configure message texts for feeds.
Checked on a database with an existing feed type notice (not deleted) and
on one without any references to the feed message transport type (deleted!)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Marc Véron [Thu, 11 Sep 2014 14:59:37 +0000 (16:59 +0200)]
Bug 12865 - 'Pay amount toward all fines' does not record payment note
Without patch:
-------------
Make payment for patron who has fines
Select the Pay Amount button and add a note in the note box.
Select confirm
Result: The note does not display in list
With patch:
----------
Result: The note displays in list
Bonus testing: The note is included in system logs as well (Home:Tools:Logs)
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Marc Véron [Wed, 19 Nov 2014 10:40:39 +0000 (11:40 +0100)]
Bug 10956 - Series of OPAC searches can cause a browser crash
This patch fixes the issue for bootstrap. It was earlier fixed for the prog theme.
Solution: Prevent jQuery.fn.highlight = function(pat) to be called with empty pat
by skipping empty values in highlight loop.
To test:
Without patch, do a search as in comment #1 odr #3
Result: Endless loop (Script not responding)
Appply patch:
No endless loop, page displays OK
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
To reproduce you need to search a string with 2 spaces.
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
I didn't manage to reproduce the problem, but I couldn't find
any regression either trying multiple searches.
Trusting Marc's and Jonathan's testing.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
0) Select a serial subscription;
1) Click Edit -> Edit subscription;
2) Click Next;
3) Click Test prediction pattern;
4) Select 3 Vols;
5) Save subscription;
6) Select Planing tab;
7) Valide "Irregularity: 3 issues".
Signed-off-by: Aleisha <aleishaamohia@hotmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Note: You have to select more than 1 issue as not to
be published to see the problem.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Test plan:
1/ Create a claimissue notice with something like:
<<LibrarianFirstname>>
<<LibrarianSurname>>
The following issues are in late:
<order><<biblio.title>>, <<biblio.author>> (<<biblio.serial>>)</order>
2/ Generated late serial issues.
3/ Send notifications to vendor.
4/ The order tags should not exist anymore in the sent email.
You can see bug 5342 for a more detailled test plan.
Note for QA: This should have been done in GetPreparedLetter, but I did
not find a better way to do.
Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described. Tested having the <order> tags on one line
and also for a multi-line layout.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 12959 - Check in forgets to remember arbitrary backdating of returns setting
Whenever a librarian is prompted with a form during the checking process
( hold to fill, transfer, etc ) the date to backdate returns to is forgotten!
Test Plan:
1) Begin returning items with a remembered backdate
2) Check in an item that need transfered or has a hold
3) Complete the action requested
4) Note your set return date is now lost
5) Apply this patch
6) Repeat steps 1-3
7) Note your backdate is now remembered!
Signed-off-by: Sean McGarvey <smcgarvey@pascocountyfl.net> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Katrin Fischer [Mon, 10 Nov 2014 19:53:20 +0000 (20:53 +0100)]
Bug 10749: Fix typo in budget_add_del permission
Updates the en permission file and adds a database
update to fix the permisson.
The update is done using the description, to not
untranslate non-English permission descriptions.
To test:
- Run the database update on your existing installation
and check the typo is gone
- Run the web installer and check there are no errors
and permissions are loaded correctly (and without typos)
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Test plan works correctly.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Kyle M Hall [Mon, 24 Nov 2014 15:18:50 +0000 (10:18 -0500)]
Bug 13330 - All overdue items with fines returned via checkouts table will have fines forgiven!
Due to a disconnect between how booleans are handled in Perl vs JSON,
all checkins done from the checkouts table will have fines forgiven!
This is because the parameters sent to svc/checkin are coded in JSON
and the JSON false is treated in Perl as the string 'false' which
evaluates to true!
Test Plan:
1) Find a patron with an overdue item that has a fine
2) Return the item via the checkouts table on circulation.pl or moremember.pl
3) Note the fine is forgiven
4) Apply this patch
5) Repeat steps 1-2
6) Note the fine is no longer forgiven
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Verified bug, fix corrects the problem.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Also tested waiving fines form the check-in page still works.
Passes tests and QA script.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Magnus Enger <digitalutvikling@gmail.com>
Fixes names and mappings for contributors from Oslo Public Library.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Kyle M Hall [Wed, 19 Nov 2014 12:24:20 +0000 (07:24 -0500)]
Bug 13297 - Shelving location PROC does not work according to manual
According to the manual, "Items will stay in the PROC location until
they are checked in".
This is not the actual behavior. Right now items will only change from
PROC to CART, and that is only if InProcessingToShelvingCart is enabled.
Some libraries want to use the PROC to permanent location feature,
without using the CART.
Additionally, the location is only removed if using returns.pl, but
that is not what the manual says either. What if the library uses
SIP2 devices for handling returns? This should be taken into
account.
Test Plan:
1) Apply this patch
2) Set an item's current location to PROC, and it's permananet location
to a different location.
3) Check the item in any way you wish
4) Note the shelving location is updated to the permanent location
5) prove t/db_dependent/Circulation/Returns.t
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I tested this with items which had items.location set to 'PROC' and
items.permanent_location set to NULL, '', and a real value, and it
worked correctly in all cases. I tested with check-ins from returns.pl
and from the table of checkouts in circulation and the PROC location was
correctly removed in both cases.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, passes tests and QA script.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Marcel de Rooy [Sun, 23 Nov 2014 11:25:34 +0000 (12:25 +0100)]
Bug 13314: [QA Follow-up]: Add another line for Fridolin to .mailmap
There are still 9 patches of Fridolin under an old email address.
This patch also takes them into account.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Tested by generating the release notes. I noticed that
the 'company' list often has a domain name instead
of a company name, maybe something for another patch.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Bug 13314: Fridolin and Simith fixes to the .mailmap file
As part of some tidying for the 3.18 release notes, I add this mappings.
To test run the command from the first comment before and after applying
the patch.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Kurdish translation files use a variant of Arabic script,
they need to be displayed as RTL.
Currently that is inferred from language dir name after
translation, and that name use the language tag, so we
need to change it from 'ku' to 'ku-Arab'
To test:
1) Translate to Kurdish
(cd misc translator; ./translate install ku)
2) Enable Kurdish on opac/staff
3) Test staff/opac interface, they are displayed as LTR
which is wrong
4) Disable Kurdish language
5) Do a cleanup (git clean -f -d)
5) Apply the patch
6) Translate again
(cd misc translator; ./translate install ku-Arab)
7) Enable again
8) Test again, this time display is correct (LTR)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Easy to test. Well spotted Bernardo.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.
The "Override renewal limit" checkbox no longer works to un-hide the
renewal checkboxes in the table of checkouts. I assume this is because
the script works in such a way that it is looking for the checkboxes
before they are part of the document.
Test Plan:
1) Apply this patch
2) Check the "Override renewal limit" checkbox
3) Note the checkbox now appears
Note, this change allows the "X of Y renewals remaining" to be displayed
for non-renewable items. I left this as it is for two reasons: 1) it
gives the librarian more information that may be useful, and 2) it looks
nicer and more uniform.
Signed-off-by: Frederic Demians <f.demians@tamil.fr>
I confirm the bug and the solution.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes tests and QA script, works as described.
Exception: on-site checkouts can't be renewed.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Owen Leonard [Tue, 18 Nov 2014 14:16:53 +0000 (09:16 -0500)]
Bug 13271 - Subject search links broken if XSLT and OPACPopupAuthorsSearch are both off
This patch corrects some faults in the OPAC's bootstrap template which
prevent additional author and subject searches from working correctly
with OPACPopupAuthorsSearch both on and off.
Some JavaScript has been removed because it was used only by the prog
theme and is obsolete.
Locate a title with multiple subjects and additional authors. Test the
following conditions:
OPACXSLTDetailsDisplay is blank and OPACPopupAuthorsSearch is off:
- Clicking an additional author or subject link should directly trigger
the correct search without an JavaScript error.
OPACXSLTDetailsDisplay is blank and OPACPopupAuthorsSearch is on:
- Clicking an additional author or subject link should trigger a modal
window where you can select options for searching. Checking boxes and
submitting the form should perform the correct search.
OPACXSLTDetailsDisplay is set to "default" and OPACPopupAuthorsSearch is
on OR off:
- Clicking an additional author or subject link should directly trigger
the correct search without an JavaScript error.
(OPACPopupAuthorsSearch only works with the non-XSL view).
For extra credit: Test with JavaScript disabled and confirm that link
still work correctly.
Signed-off-by: Frederic Demians <f.demians@tamil.fr>
I confirm the bug and the solution. Before various JS errors: "ReferenceError:
e is not defined" and "ReferenceError: showSubjects is not defined". After:
Comforting silence, and functionnality.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Fridolin Somers [Thu, 9 Oct 2014 14:10:24 +0000 (16:10 +0200)]
Bug 13053 - Do not use template cache when from commandline
You may define in config a folder (usually /tmp) for TT cache :
template_cache_dir in etc/koha-conf.xml.
Some perl pages may be launched from commandline, like tools/export.pl.
Also, the script gather_print_notices.pl uses C4::Templates.
The problem is that when script is launched from Apache, the Unix owner of cache files will be www-data. When script is launched from commandline, like in a cronjob, the Unix owner will be different (like a user named "koha"), causing a crash because cache files can only be read by its owner.
This script disables the template cache if perl script is called from commandline. This cache is certainly only useful for web access.
Using GATEWAY_INTERFACE env var comes from tools/export.pl
Test plan :
- Use a dev install of koha installed in a user home, ie "/home/kohadev"
- Define a folder for template_cache_dir in etc/koha-conf.xml. For example : <template_cache_dir>/tmp</template_cache_dir>
- Check there is no cached templates already in this forder
- Create a file "bib.list" containing a few existing biblionumbers
- As user kohadev, launch : tools/export.pl --record-type=bibs --id_list_file=bib.list
- Look at cache folder
=> Without patch you see cache files owned by user kohadev
=> With patch there are no cache files
- Use the Koha interfaces OPAC and Intranet
=> Without patch you get an error : Template process failed: file error - cache failed to write ...
=> With patch you have no error and cache files are generated with Apache user as owner
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, good test plan!
Passes tests and QA script.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Jonathan Druart [Mon, 8 Sep 2014 14:09:22 +0000 (16:09 +0200)]
Bug 12886: shelfbrowser script should write headers
opac/svc/shelfbrowser.pl does not write http headers.
On a production server, this patch resolves a server internal error
(500):
Bad header= <div id="shelfbrowser">
I did not reproduce on my local instance, but this should be fixed.
Test plan:
Verify there is no regression on browsing a shelf (with "en" and translated
templates)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes tests and QA script, no regressions found.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 5304: GetItemsInfo() - moved issues and serials query from the results loop to the main query
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
No commit message
No test plan.
No regressions found on opac/staff item display
No improvements either, but could be just my test data
No koha-qa errors
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Passes tests and QA script.
Tested detail and item pages in OPAC and staff, no regressions found.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 5304: Use branch codes from the database rather than hardcoded CPL and MPL
http://bugs.koha-community.org/show_bug.cgi?id=5304 Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
No commit message
No test plan.
prove t/db_dependent/Items.t pass
No koha-qa errors
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Katrin Fischer [Sun, 9 Nov 2014 22:58:03 +0000 (23:58 +0100)]
Bug 13133: Fix mangled titles on pay fines page
Titles with diacritics don't show correctly
on the 'pay fines' page in the patron account
in staff.
To test:
- Catalog or find a record with non-latin script
Something like a word in Hebrew would work.
- Create a fine entry for that record
Something like a rental fee works.
- Verify that the title doesn't display correct
on the pay fine page (other tabs are ok)
- Apply patch
- Check the pages again - display should be
correct now.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Jonathan Druart [Thu, 12 Jun 2014 15:04:03 +0000 (17:04 +0200)]
Bug 12411: Preferences values should be utf8 encoded
Test plan:
Fill OPACMySummaryNote or NoLoginInstructions with something like "éàç"
and verify the display is broken.
Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Works as described. Fixes the issue.
Kyle M Hall [Tue, 18 Nov 2014 14:17:40 +0000 (09:17 -0500)]
Bug 13286 - Checkouts table due date not updated when an item is renewed.
When an item is renewed from the checkouts table, the new due date is
displayed in the renewal column, but the old date due is still displayed
in the due date column. This should be updated as well.
Test Plan:
1) Apply this patch
2) Renew an item from the checkouts table
3) Note the date due is updated in the "Due date" column
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
This works well in my test. My librarians will be grateful for the fix
-- they were complaining about this bug.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, passes tests and QA script.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Owen Leonard [Fri, 3 Oct 2014 16:24:36 +0000 (12:24 -0400)]
Bug 11271 - Serials table off the screen in smaller viewports
When you search for serials in the Serials module the results table is
often too wide for the screen (depending on your browser window size).
This is partly due to the fixed width of the search fields in the table
footer.
This patch applies a flexible width to those <input>s and reduces the
font size of their text.
This patch also moves the "action" links for each table row into an
"action" menu (similar to the change made by Bug 10615 in Reports) to
further conserve screen space.
This patch also revises the page's DataTables configuration to use table
header classes for sorting configuration.
To test you should be able to perform a search which returns multiple
open and closed subscriptions.
- Test that table sorting works correctly, including for titles with
articles and for dates.
- Test that the Action menu items work correctly and that they correctly
reflect the permissions of the logged-in user with regard to
receive_serials and routing.
- Perform these tests on both the "Open" and "Closed" tabs.
Signed-off-by: Chris <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely and improves the display significantly.
Passes tests and QA script.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Jonathan Druart [Fri, 13 Jun 2014 09:20:33 +0000 (11:20 +0200)]
Bug 12415: Fee receipt: a charges description should be displayed in all cases
Bug 2546 removes the description DB field value in some case (3.15.00.003).
But the receipt generated by scripts members/printfeercpt.pl and
members/printinvoice.pl displays this field.
When the description field is empty, the default value (based on
accountlines.accounttype) should be displayed.
Test plan:
- Generate and pay some different kinds of fees for a patron without
filling the 'description' field.
- In Fines>Account, click on the 'print' link.
- Before this patch, the "description of charges" values is empty if no
description was given.
It is a regression introduced by bug 2546, a default value was
inserted in the description field depending on the account type
selected.
- After this patch, the "description of charges" values should be based
on the account type. The string display on printing receipt should be
the same as on the account screen (staff and opac).
Note for QA: If removed the "payment" key, it is not used in template
and generated a warning ("odd number of elements...").
Signed-off-by: Nick Clemens <nick@quecheelibrary.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
This fixes the display of payments and other charges on the
fines slip.
Note: This patch fixes a line where the description in the
database was still updated to say "Payment thanks" for partial
payments. It might be worth to do a follow-up correcting the
accountlines table and removing the unwanted comment (see bug 2546).
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Stéphane Delaune [Fri, 14 Nov 2014 07:48:54 +0000 (08:48 +0100)]
Bug 13247 - Move opacuserjs at the end of opac-bottom.inc
This patch makes opacuserjs compatible with tracking tools like Piwik
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Small change to enable use of opacuserjs for statistical
tools like Piwik by moving it right above </body>.
Works as described.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Kyle M Hall [Wed, 29 Oct 2014 17:03:50 +0000 (13:03 -0400)]
Bug 13162 - Label batch editor title sorting by default, rather then label number
The label batches editor has always sorted by the order the items were
added to a batch. However, it is now sorting by title. This should be
remedied.
Test Plan:
1) Create a label batch
2) Note the items are in order of title ( summary )
3) Apply this patch
4) Refresh the page, not the items are now sorted by label number
Tiny patch. Works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes tests, works as described.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Owen Leonard [Tue, 7 Oct 2014 13:38:38 +0000 (09:38 -0400)]
Bug 13036 - Exclude control columns from sorting on staff client catalog detail page
The checkbox and "edit" column in the table of holdings on the
staff client detail page should be excluded from sorting since there is
no useful data to sort. This patch does so.
To test, view the detail page for a title which has multiple items.
Confirm that sorting works correctly.
Test under the following conditions:
- with the StaffDetailItemSelection system preference enabled and
disabled.
- as users who do and do not have cataloging item edit privileges
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as desrcibed, no problems found.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Owen Leonard [Tue, 11 Nov 2014 16:09:17 +0000 (11:09 -0500)]
Bug 9177 - Duplicate patron: Prepopulated fields ar cleared when setting cursor
When adding a duplicated patron record some fields are prepopulated from
the original patron record. Focusing your cursor on these fields
automatically clears them. This works well if you assume that the user
only focuses on fields which should be changed. This works badly if you
consider that a user might want to tab between all fields. I think the
disadvantages outweigh the minor benefit of not having to delete the
contents of a field.
This patch removes the clearing action.
TEST PLAN
---------
1) Log in to staff client
2) Patrons
3) Find an existing patron
4) Click on the link in the Name column
5) Click on the Duplicate button
6) Click on fields with data in them.
-- they will clear, which is more problematic than correcting
the entry.
7) On the line
"Home > Patrons > {patron name} > Duplicate Adult Patron"
click the patron name to go back.
8) Click on the Duplicate button
9) Tab through the fields
-- the fields should remain unchanged, but sadly they clear.
10) Apply the patch
11) On the line
"Home > Patrons > {patron name} > Duplicate Adult Patron"
click the patron name to go back.
12) Click on the Duplicate button
13) Navigate through the fields
-- tabbing nor clicking should clear any fields.
14) Run koha qa tests
NOTE: Had to rebase again. Yes, bug 7878 interfered.
However, it deals with comment #6, which Owen
appropriately noted.
Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Less surprises, improves accessibility by enabling to
tab through the form without losing data.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Marcel de Rooy [Mon, 13 Oct 2014 14:20:21 +0000 (16:20 +0200)]
Bug 8337: Small typo in usage statement for longoverdue.pl
The charge with the replacement price will only be made if the charge
parameter matches the lost value. The given example is faulty (as well
as some of the code, as it appears ;)
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Frédérick [Thu, 21 Mar 2013 21:51:46 +0000 (17:51 -0400)]
Bug 8337 System preferences for longoverdue cron
Patch to follow that adds 3 new system preferences to control the
parameters for the longoverdue script.
New prefs are DefaultLongOverdueChargeValue, DefaultLongOverdueLostValue
and DefaultLongOverdueDays.
These preferences are used when you call the longoverdue.pl script without
their parameters.
Sponsored-By: CCSR Signed-off-by: Leila and Fridos help <koha.aixmarseille@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Jonathan Druart [Thu, 18 Sep 2014 08:23:47 +0000 (10:23 +0200)]
Bug 12775: Suggestions should be ordered by anyone
Currently only the suggestion manager can order from accepted
suggestion.
This patch set to default the ability to show all suggestions when
ordering from a suggestion.
2 links "show only mine" and "show all" permits to filter/show all
permissions.
Test plan:
Create an order from a suggestion and verify you are able to see all
suggestions by default.
Verify the "show only mine" link works as expected.
Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Kyle M Hall [Wed, 17 Sep 2014 14:09:06 +0000 (10:09 -0400)]
Bug 12943 - Add patron branchcode to patron search results for holds
For some libraries, the current information specified in the patron
results when search for a patron to place hold is insufficient. These
libraries would like the branchcode to be added to the results to help
identify the correct patron.
Test Plan:
1) Apply this patch
2) Browse to the holds for a record
3) Search for patrons from the record holds screen
4) Note the patron results now have the branchcode after the patron type
Signed-off-by: Nick Clemens <nick@quecheelibrary.org> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Owen Leonard [Wed, 17 Sep 2014 18:48:49 +0000 (14:48 -0400)]
Bug 12893 - 'Clear date' links on start and expiration hold date in staff not working
I introduced this bug with my patch for Bug 8181. In changing the way
the date picker widgets worked I changed the ID the "clear date"
javascript was looking for, so it stopped working.
This patch corrects it and improves the JavaScript by moving it out of
the HTML markup.
This patch also makes some minor HTML validity corrections: escaping
ampersands and removing a "size" attribute from a hidden form field.
To test, you should have the AllowHoldDateInFuture system preference
enabled. Place a hold in the staff client for a patron and confirm that
you can choose a "hold starts on" date and a "hold expires on" date and
that the respective "clear date" links work correctly for each one.
Signed-off-by: Nick Clemens <nick@quecheelibrary.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Fridolin SOMERS [Fri, 10 Jan 2014 10:52:22 +0000 (11:52 +0100)]
Bug 11515 - Encoding problem with OpacBrowseResults
When OpacBrowseResults syspref is on, the detail page contains a results browser.
When search terms contains non-ASCII character, the search query is not well encoded in this browser.
This patch adds the URI-coding to search terms into session to avoid any encoding problem with diacritics and URI specific characters like ?,& ...
So that TT parameter 'busc' is already URI encoded and can be used to recreate seach URL.
Test plan :
- Set OpacBrowseResults on
- At OPAC, perform a search with a diacritique. For example 'déjà'
- Go to detail page of a result
=> You see browser under "Browser results"
- Click on "Back to results"
=> You get same results and same search term with correct encoding
Signed-off-by: Broust <jean-manuel.broust@univ-lyon2.fr> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug still present on master. I note that latin characters are taken by ISO-8859-1 encoding
(Perl's default) and that's why real UTF8 ones don't break (Perl notices they are UTF-8).
Jonathan Druart [Thu, 28 Aug 2014 10:39:44 +0000 (12:39 +0200)]
Bug 12840: The budgeted cost and the total are automatically calculated
Both of these 2 values should not be modified by the user.
Since these values depend on the discount and the quantity.
Test plan:
Verify you cannot modify the budgeted cost and the total price on
creating/modifying an order.
Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Marcel de Rooy [Thu, 9 Oct 2014 11:09:47 +0000 (13:09 +0200)]
Bug 13050: Follow-up for bug 12371
This patch simplifies the SQL query in Letters.pm for table
borrower_modifications.
It also addresses the only case this query is used in opac-memberentry.
An unused variable in Letters.pm is removed.
Test plan:
Enable selfregistration on opac.
Set verification by email to required in prefs too.
Self-register two new users.
Check the email notices generated.
Verify the new users with the tokens in their notice.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Much cleaner SQL
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Cleaner and works as described, no regressions found.
Passes tests and QA script.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 12909 - item withdrawn is missing in inventory results
In inventory results, CSV or screen, the item withdrawn information is missing.
This information can be usefull to understand why an item was not scanned.
Test plan :
- Check you have in default framework an item subfield mapped with items.withdrawn
- Create a biblio with default framework
- Create an item with barcode='000AAA1', callnumber='ZZZAAA1' and withdrawn=0
- Create an item with barcode='000AAA2', callnumber='ZZZAAA2' and withdrawn=1
- Go to inventory tool : /cgi-bin/koha/tools/inventory.pl
- Enter item callnumber between 'ZZZ' and 'ZZZZ'
- Submit
=> You see a column 'Withdrawn' with withdrawn value
- Go to inventory tool : /cgi-bin/koha/tools/inventory.pl
- Enter item callnumber between 'ZZZ' and 'ZZZZ'
- Check 'Export to CSV file'
- Submit
- Open exported file
=> You see a column 'Withdrawn' with withdrawn value
Signed-off-by: Nick Clemens <nick@quecheelibrary.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Owen Leonard [Tue, 23 Sep 2014 18:41:06 +0000 (14:41 -0400)]
Bug 12981 - Patron attribute type limit by patron category not working on patron entry form
To reproduce this bug:
- Create a patron attribute type and limit it by patron category
- Create a new patron with that category
- Observe that there is no entry field for the patron attribute type you
created for that patron category. Inspecting the source should show
that the entry field has been hidden.
The patron entry form tries to hide patron attribute type input fields
based on the currently selected patron category. It does this based on
the value of $("categorycode"). However, instead of pulling the data
from the categorycode input in the body of the entry form, it pulls it
from the patron search box at the top of the page. The value of that
input is always empty because no category is preselected.
This patch corrects the problem by changing the ID of the categorycode
<select> in the body of the entry form and making corresponding changes
to the JavaScript which depends on it.
To test, apply the patch and load the patron entry form for a patron
category to which a patron attribute type has been limited. That patron
attribute entry field should appear correctly.
Choose a different patron category from the "Category" dropdown. Confirm
that the patron attribute entry field has been hidden.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Owen Leonard [Tue, 7 Oct 2014 14:01:12 +0000 (10:01 -0400)]
Bug 13037 - Staff client cart should exclude articles when sorting by title
This patch modifies the configuration of the staff client cart table
sorting to enable title sorting to ignore articles. Other column sorting
configuration settings are revised to use table header classes instead
of indexes.
To test, add multiple titles to the staff client cart, choosing several
titles which begin with articles ("a," "an," or "the" in English). View
the cart and test sorting of all columns. Sorting by title should sort
correctly while ignoring articles. Other columns should sort correctly
too.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes tests and QA script, works as described.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Owen Leonard [Thu, 13 Nov 2014 17:49:42 +0000 (12:49 -0500)]
Bug 13151 - staff marc preview not wrapping
The MARC preview available on the staff client detail page doesn't wrap
long lines of text because it uses a huge block of whitespace-formatted
text in a <pre> tag. The OPAC doesn't have this problem because the MARC
preview is formated in a table.
This patch copies the OPAC's "plainMARC.xsl" file for use in the staff
client. The preview modal has been converted to use Bootstrap following
the method used in Bug 12755
To test, apply the patch and clear your browser cache. View the
detail page for a bibliographic record in the staff client. Click the
link to show the MARC preview. Confirm that the modal looks correct,
works correctly, and adapts gracefully to different browser widths.
Confirm that the MARC preview and Card links still work from Z39.50
searches.
Note: This patch assumes that UNIMARC records display correctly using
xslt/plainMARC.xsl. Please let me know if that is wrong.
Signed-off-by: Frederic Demians <f.demians@tamil.fr>
I confirm it works: nice modal dialog box; display aligned on opac display;
works also with Unimarc biblios.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>