Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit cfce425771350912c3cd8e21c8e205d776aaa443) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Jonathan Druart [Wed, 31 Dec 2014 11:09:49 +0000 (12:09 +0100)]
Bug 13502: Add tests to highlight the problem
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Tue, 30 Dec 2014 21:20:59 +0000 (10:20 +1300)]
Bug 13502: Code introcduced in 1861 wrongly assumes a null userid is unique
To test
1/ Create a borrower with '' as their userid, you may have to edit a
row in the db to do this
2/ Run perl t/db_dependent/Circulation/CheckIfIssuedToPatron.t
3/ Notice some tests fail and you see
DBD::mysql::st execute failed: Duplicate entry '' for key 'userid'
at /home/chrisc/git/catalyst-koha/C4/SQLHelper.pm line 184.
4/ Apply the patch
5/ Run the tests again, notice they now pass
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Wed, 10 Dec 2014 14:02:57 +0000 (09:02 -0500)]
Bug 13341 - Hard-coded "Preview" text in OPAC openlibrary.js
The OpenLibrary JavaScript includes an untranslated string, "Preview."
This patch move the string to the template so that it can be translated.
To test, apply the patch and test that the translator picks up the
string:
1. From misc/translator run 'perl translate update [lang]' (e.g. de-DE)
2. Edit misc/translator/po/[lang]-opac-bootstrap.po and add a
translation for the updated "Preview" string
3. Remove the "#, fuzzy" marker from that entry
4. From misc/translator run 'perl translate install [lang]'
5. Enable the [lang] translation for the OPAC in system preferences
6. Enable the OpenLibraryCovers system preference.
7. In the OPAC switch to the [lang] translation.
7. View the detail page for a title for which there is an OpenLibrary
cover image. Below it you should see a preview link with the
translated string you added in step 2.
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: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 049bd2da2312b26d0a63adecdc8331e48e3a0efd) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Martin Renvoize [Fri, 12 Dec 2014 12:18:47 +0000 (12:18 +0000)]
Bug 13447: Fixed HTML Email Reports
A tiny typo made in runreport.pl when updating it for bug 9530 lead to
no body being attached to html emails.
Signed-off-by: Chris <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 36f56b81774340a49f3ad137c77d0d74207acbc1) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Lyon3 Team [Fri, 5 Dec 2014 08:27:02 +0000 (09:27 +0100)]
Bug 12895 repair dropbox mode
One day late patrons were restricted even with dropbox mode activated
1) Check in the calendar (Tools/Calendar), that the
previous days you are about to use as date due are
really entered as opening day (never know).
2) Add a suspension in the suspension days parameter
of the circulation rules (Administration/Circulation
and fine rules) to the MOST specific category of
borrower and MOST specific type of document among the
existing rules of the LOGGED IN Site(cf explications
in the circ-rules page).
3) Choose a borrower using the search by category and an
item through the advanced search using the limit by type.
4) Checkout the item selecting the previous opening date
in the Specify-due-date box.
5) Click on Circulation in the upper menu, then on Checkin
and check the Book drop mode. The Book drop date showed
should be the previous opening date.
6) Check in the item : you can see that the patron is restricted
7) apply the patch
8) Redo 1 to 5 : Now, you can see that the patron is not restricted.
9) If you redo the test with two day late, you will see that
the patron is not restricted : that's ok because his
restriction of one day is already finished.
10) If you redo the test with more than two day late, you see
that the patron restriction is, as expected, one day shorter
than it were if the item had been returned without dropbox mode.
Signed-off-by: Nick Clemens <nick@quecheelibrary.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit c1621de8a503d5505d0bd697a4b64eacf50c095d) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Jonathan Druart [Fri, 26 Dec 2014 09:22:34 +0000 (10:22 +0100)]
Bug 13458: Display the correct patron categories
Bug 9811 removes useful code.
Actually the AddPatronLists pref is not sent to the template from
members/member.pl.
To fix this issue, we can use the existing not clean way, or compare the
syspref value directly in the template. This second solution is
implemented in this patch.
Test plan:
1/ Set the AddPatronLists pref to 'specific'
2/ On the patron home page (members/members-home/pl), the patron search
result page (members/member.pl after launching a search) and on the
checkouts page/patron search result (circ/circulation.pl after searching
a patron using the check out), verify that the patron category list is
the specific ones.
3/ Test there are no regression with the AddPatronLists pref set to
'general'.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Works as described and fixes the problem.
Note: I am not sure if AddPatronLists makes sense -
if you set it to general patron types, it still preselects the
wrong category type (tried organization, a child patron category
was selected). Also the name is confusiong nowadays with the
Patron list feature.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 2b39823c0f4cec1607078de1f2547afc95ae87cd) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
The RoutingSerials preference controls if the routing
list related functionality is visible in the serials
module.
To test:
- Go to the system preference editor - RoutingSerials
- Check the current description
- Apply patch
- Check the new description
- Verify functionality matches description
NOTE: The preference change is merely cosmetic. The value is
still YesNo. A few git reset --hard origin/master
and page refreshes confirmed expected values.
Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 90ebffcffae59b5ded2db3dce875be0293b845e1) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Tue, 18 Nov 2014 14:07:49 +0000 (14:07 +0000)]
Bug 13285 Do the right thing if opacthemes is not set
If opacthemes is not defined updatedatabase reports the
subsequent warnings as an error. Take account of the case where
it is not set and default that to bootstrap.
This is probably a rare occurence, but should be handled
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>
(cherry picked from commit 90c32e88561530143ced5d190445850291f6851e) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Kyle M Hall [Tue, 21 Oct 2014 10:18:29 +0000 (06:18 -0400)]
Bug 13124 - Record titles with parentheses causing label weirdness
Test Plan ( using sample data included with Koha )
1) Catalog a record and item with the title "Oh no! or, (How my
science project destroyed the world) /"
2) Edit the DEFAULT template
a) Set layout type to Biblio
b) Set data fields to "title, author, isbn, issn, itemtype,
barcode, itemcallnumber"
c) Set font size to 10
3) Create a batch with just the one item you created
4) Export the PDF with the Avery template and the DEFAULT layout
5) Note the weirdness
6) Apply this patch
7) Re-export the PDF, note it's no longer weird ; )
Signed-off-by: Nick Clemens <nick@quecheelibrary.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit fe4da2f721c371540fe88d0014a49a866b403ca4) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 13357: Untranslatable strings on itemsearch.tt
This patch enable translation of labels on itemsearch.tt
To test:
1) Translate for a fairly complete language (es-ES de-DE)
2) On staff, go to Search > Item search
3) Check there are many untranslated strings
e.g. Text before pulldowns on first and second box
All options on third box
4) Apply the patch
5) Repeat 1 & 2
6) Check there are now some strings translated
7) Update translation file, check there are some
new strings to translate (may be they are fuzzy)
e.g. "All statuses", "All collection codes"
Patch works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 1eb85ad7578410354668ff81f9f35bbc2f6b9734) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Jonathan Druart [Tue, 30 Dec 2014 08:51:32 +0000 (09:51 +0100)]
Bug 1861: Add 1 test to AddMember
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
(cherry picked from commit 5b165a2420bf4f024d7936477c214b6261b4e567) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Check_Userid returns 1 if it is unique. So this means unique userids
will always be discarded and new ones created.
This is why all the tests depending on a userid are now failing
To test
1/ run perl t/db_dependent/Serials_2.t
2/ Notice lots of tests fail
3/ OR Add a borrower with a userid set, notice the userid is ignored
and one is generated instead
4/ Apply patch
5/ Add a new borrower, notice the userid sticks (if it is unique)
6/ Run perl t/db_dependent/Serials_2.t notice tests pass
7/ Run perl t/db_dependent/Members.t notice tests still pass
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
(cherry picked from commit f326488f9afb9752b93d07858b6ac9d525838ff0) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Jonathan Druart [Thu, 27 Nov 2014 15:54:21 +0000 (16:54 +0100)]
Bug 13360: C4::Ris assumes that hash keys are ordered - KW
This patch only fixes the KW order.
Test plan:
1/ Choose/create a record with several 6XX (for KW), see the code source
to know which fields you can use
2/ Export this record in RIS format
3/ Verify that the KW lines are ordered following the marc record fields
order.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
We really should refactor this whole thing into Koha::RIS sometime, it's
a horrible module at the moment.
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 801ba4a9204254fb2c24726495370ce813b1b22b) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Mark Tompsett [Fri, 12 Dec 2014 17:28:11 +0000 (12:28 -0500)]
Bug 13453: Koha.t daily quote tests assume sample data
By adding quotes 3 and 25 from the sample data, this test can
pass without having the sample quote data loaded.
TEST PLAN
---------
1) Ensure there is no quote id=3 or that it is NOT
Abraham Lincoln.
2) prove t/db_dependent/Koha.t
-- this should fail the daily quote test.
3) apply patch
4) prove t/db_dependent/Koha.t
-- this should *NOT* fail the daily quote test.
5) run koha qa test tools
Followed test plan 1)-4). Without patch, daily quote test failed. With patch, test passed OK. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Works as described, leaves actual data unchanged.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 7aec3a9aa4ed826767fb02c2b4b3acf90b5f0e54) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Kyle M Hall [Thu, 20 Nov 2014 16:01:08 +0000 (11:01 -0500)]
Bug 1861 [QA Followup] - Don't modify userids, warn if we can't modify the index automatically
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 179ef0f28f7216231a07adb69fc0f3e1e4858d1a) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Kyle M Hall [Mon, 3 Nov 2014 12:38:48 +0000 (07:38 -0500)]
Bug 1861 [QA Followup] - Fix Check_Userid and unit tests
Check_Userid assumes that a borrowernumber will always be passed in
and thus fails to to return 0 for an already used userid when creating
a new patron.
Unit tests must now also me modified to no longer assume it is possible
to create multiple patrons with the same userid.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 7135364dd23442c38bed986b2540ab63cfd06ce1) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Kyle M Hall [Tue, 8 Jul 2014 13:50:08 +0000 (09:50 -0400)]
Bug 1861 - Unique patrons logins not (totally) enforced
The Koha 3.0 patron admin page will prevent you from creating a user who
has an identical OPAC login as someone else (though I would change the
error message from "Login/password already exists." to "Login
already exists.", since it's not the password that's the
problem).
However, there's nothing enforced in the MySQL database to prevent
patrons from being imported or manually inserted with duplicate logins.
Would it be better to change the MySQL spec from this:
KEY `userid` (`userid`)
to this:
UNIQUE KEY `userid` (`userid`)
Test plan:
1) Enter mysql console
2) Attempt to create two borrowers with identical user id's
3) Note you are able to do so
4) Delete these bororwers
5) Apply this patch
6) Run updatedatabase.pl
7) Repeat step 2
8) Note you are now unable to do so
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described, no koha-qa errors
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Leaves deletedborrowers as it is, deleting patrons still works ok.
Works according to test plan.
Database update will only be successful, when no duplicate entries
exist in the database.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit df4297621d285dbdbe13eaff04dae2a9419ed824) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This patch updates the image replacement technique used for Koha's login
page. The old technique used a negative text-indent value to move the
text offscreen, but that begins to fail more and more often as screens
get larger.
The new technqiue is described here:
http://www.zeldman.com/2012/03/01/replacing-the-9999px-hack-new-image-replacement/
Note: This patch has not been tested in any Internet Explorer version!
To test you must have a screen which is wider than 2000 pixels. Apply
the patch, clear your browser cache and view the staff client login
page. The logo on the login form should look correct with no
corresponding text appearing anywhere on the screen.
Signed-off-by: Christopher Brannon <cbrannon@debian.localdomain> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 87a0b79a65f179fdef5aee98701660cca00a273e) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Jonathan Druart [Thu, 11 Dec 2014 11:07:17 +0000 (12:07 +0100)]
Bug 10753: Any library is represented by an empty string
And not with "__ANY__"
Test plan:
0/ Don't apply this patch
1/ Create a suggestion for "any library"
2/ Verify suggestions.branchcode contain "__ANY__"
3/ Apply this patch and execute the updatedb entry
4/ Create a suggestion for "any library"
5/ Verify suggestions.branchcode contain "" (for both suggestions).
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 67c3217238d6193d953914e9f2eaf816683306d7) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Note: it also fixes a minor POD error.
(cherry picked from commit cbf784bb9d8c01d1c05cae00d046d3799a1d7ed9) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Bug 13436: (RM followup) university -> academic DB update
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 281b3225fcbafbb26568f57c2547c4fe13bde017) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Conflicts:
installer/data/mysql/updatedatabase.pl
Aleisha [Mon, 15 Dec 2014 20:57:56 +0000 (20:57 +0000)]
Bug 13436: Adding more options to UsageStatsLibraryType syspref
Added options:
- research
- private
- society or association
- corporate
- government
- religious organization
- subscription
- school
Also changed 'university' to 'academic'
To test:
1) Go on to Global System Preferences and find UsageStatsLibraryType under Administration
2) Click drop-down menu and see all new options described above, as well as 'academic' instead of 'university'
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: replace tab with spaces
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 30e40bd8847d3b015477bae50f6a40358d9f70ca) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Katrin Fischer [Sun, 30 Nov 2014 07:18:11 +0000 (08:18 +0100)]
Bug 12565: Acq: Fix broken link in breadcrumbs
The link back to the basket when creating an order by
searching for an existing record in the catalog is
broken.
To test:
- Start a new basket
- Create a new order line by searching for an existing
record in your catalog
- Try the link back to the basket from the breadcrumbs
at the result list page
- Verify that the link is broken
- Apply patch and retest
Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit e04b3ef0685f2bbe8a25b65181c937b8eb5e34d3) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Marc Véron [Tue, 9 Dec 2014 05:35:07 +0000 (06:35 +0100)]
Bug 13422 - SCO: "Would you like to print a receipt" not translatable
To test:
Set syspref SelfCheckReceiptPrompt to "Show"
Select non English language
Go to Self Checkout and check out an item
Hit "Finish"
Make sure that confirm dialog "Would you like to print a receipt" still
appears
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>
(cherry picked from commit dd6fbe04d12a50523c8d950422ef8182cdd1ba82) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Marcel de Rooy [Tue, 9 Dec 2014 13:50:44 +0000 (14:50 +0100)]
Bug 13416: Typo in marc21_leader.pl position 5 (record status)
Instead of a space in the leader on this position, it should be an a.
Test plan:
1) Log in to staff client
2) Find a record in the catalog
3) Edit the record
4) Click the on builder popup icon.
5) View the page source
-- the option is " " for the 'a- Increase in encoding level'
entry. It really should be 'a'.
6) Apply patch.
7) Repeat steps 1-5
-- the option should be 'a' this time.
8) Run koha qa test tools.
-- Discovered it failed. Provided a patch to fix this.
It does, however, solve the major problem of ' ' vs. 'a'.
Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 7ef33d19a157c1535327feb6b6c6e3ea17e27764) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Bug 13218: (RM followup) only scroll on actually variable stuff
Most of the page contents have fixed size. The only exception is the
targets list. If the target list grows, then the whole page needs to be scrolled
in order to reach the buttons.
We should make the z3950 targets area scrollable, and remove scrolbars from all
over the place.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit c63003dd5a73f1276d7e1191bef30822326f2994) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Jonathan Druart [Wed, 10 Dec 2014 08:54:06 +0000 (09:54 +0100)]
Bug 13218: (qa-follow-up) replace tab with spaces
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit c102f6bd7f6f4d0073a0da8c5ea84e8ad4c39da1) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Liz [Thu, 20 Nov 2014 07:02:29 +0000 (07:02 +0000)]
Bug 13218: fixing acquisitions z39.50 interface to be consistent with the others.
Changes:
* Two columns of search fields into one
* moves targets from below search fields to the right of them
To test:
* Create a basket in acquisitions
* attempt to add a record to the order from an external source
* note the changes to the layout
* complete a couple of additions to the basket - functionality should be unchanged.
If you like the changes, sign off :)
Signed-off-by: Frederic Demians <f.demians@tamil.fr>
Ok. Consistency welcomed!
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit ef05a256ab9333a42e9add98ea9c502c3459de9a) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Liz [Thu, 6 Nov 2014 08:29:02 +0000 (08:29 +0000)]
Bug 13218: usability enhancements for z39.50 searches
This patch rearranges the layout of the z39.50 search pages in cataloguing and
authorities. There should be no functional change to z-target searching, all
functions should remain the same.
Changes:
* 2 columns of search fields condensed into one
* zTargets moved from below the search fields to beside them
* rearranged search fields into perceived frequency of usage, from most used to
least
* changed label of Raw (any) to Keyword (any)
To test:
* click cataloguing -> new from z39.50/SRU
* observe how the layout has changed
* import a record or two using the search - there has been no change to the
function, it should all be working.
* Click Authorities -> new from z39.50
* observe how the layout has changed
* import an authority or two using the search - there has been no change to the
function, it should all be working.
* sign off if you think these changes are nice. Comments and suggestions are
also welcome regarding this change.
Signed-off-by: Frederic Demians <f.demians@tamil.fr>
Nice evolution of the z3950 search/result pages.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit edfc80268c3936fe68f31bf0fff0760ea6cb62e0) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Kyle M Hall [Fri, 12 Dec 2014 12:59:50 +0000 (07:59 -0500)]
Bug 13400 [QA Followup] - Fix tabs and quotes
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 5d6d9de5e7a9c682c835c2522e21d9878786fd51) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Marc Véron [Mon, 8 Dec 2014 02:55:15 +0000 (03:55 +0100)]
Bug 13400: Untranslatable "Are you sure you want to delete this authority?"
This patch makes the string "Are you sure you want to delete this
authority?" translatable using the function _(...)
To test, apply patch and check that deleting authorities still works.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested successfully with the following procedure:
1. Applied the patch.
2. Ran perl translate update de-DE
3. Edited de-DE-i-staff-t-prog-v-3006000.po to add a "translation"
4. Removed "#, fuzzy" marker from po entry.
5. perl translate -v install de-DE
6. Testing deleting an authority from the authority search results page
and from the detail page. My translated string appeared correctly.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 8523f208f30b204a2a6cffb8dd4088935bdd2343) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Jonathan Druart [Thu, 4 Dec 2014 15:05:34 +0000 (16:05 +0100)]
Bug 12059: Prefer to list fields in the query
To avoir further issue, it's better to explicitely list the fields we
want to retrieve.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit bf681e28bab3d6c5b3a190dd7fe453369d600696) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Katrin Fischer [Mon, 10 Nov 2014 08:55:52 +0000 (09:55 +0100)]
Bug 12059: Publisher column on invoice page always empty
This patch moves the publisher information out of its own
always empty column into the Summary column below the title,
as it is on other acq pages.
The information was never displaying, as publishercode is in
biblioitems and that table was not selected by GetInvoiceDetails.
Also modified the code to take into account that UNIMARC uses
biblioitems.publicationyear and MARC21/NORMARC use bibio.copyrightdate
for the copyright year.
To test:
- create an invoice for records that
- have a publication year
- have no publication year
- have a publisher...
- 'finish receiving' and check the invoice summary page
...acqui/invoice.pl?invoiceid=?
- Make sure all the information displays now but didn't witout the patch.
Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit d9c99b6f5ef40bb546231cf35581d4308f1ae3bc) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Kyle M Hall [Fri, 12 Dec 2014 12:00:29 +0000 (07:00 -0500)]
Bug 13410 [QA Followup]
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit c7081a0852b8d627328e503cfe53b8f32e6d623a) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Marc Véron [Tue, 9 Dec 2014 04:21:06 +0000 (05:21 +0100)]
Bug 13410 - Untranslatable "Change messaging preferences to default for this category?"
To test:
In staff client, go to Home > Patrons
Click button "New patron" and choose a category
Change Patron messaging preferences
Now change Category
Make sure that following message box still appears: "Change messaging
preferences to default for this category?"
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>
(cherry picked from commit 6d37e83e4dc98d4e5a061428386eb4ce0c05ef33) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Chris Cormack [Tue, 9 Dec 2014 23:47:30 +0000 (12:47 +1300)]
Bug 13425 - XSS in intranet facets - Patch for 3.18 and master
To Test
1/ Craft a url like /cgi-bin/koha/catalogue/search.pl?q=smith&sort_by='"><script>prompt('Happy_Holidays')</script>
It is important it must return results and facets
2/ Notice the js is executed
3/ Apply the patch test again
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
No prompts, no functional regressions found.
Checked selecting and undoing facets, show more links and paging.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Mark Tompsett [Fri, 12 Dec 2014 21:32:40 +0000 (16:32 -0500)]
Bug 13456: Serials/Claims.t expects no subscriptions
However, this is an unreasonable assumption for a system which
is in use (either lots of testing or production).
TEST PLAN
---------
1) Have a supplier with a late subscription.
2) prove t/db_dependent/Serials/Claims.t
-- will fail
3) apply patch
4) prove t/db_dependent/Serials/Claims.t
-- success
5) run koha qa test tools
Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 9412b905993fedeef5f5198e9f94e4f38227d227) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Test plan:
Go on catalogue/itemsearch.pl, launch a search and verify the data are
correctly displayed in the table.
Followed test plan. Works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
The paging seems still a bit buggy, but this makes the
feature usable again!
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 6114c5fd6fe735f332e1615b33bf62de0f4d936e) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Katrin Fischer [Sun, 14 Dec 2014 21:31:04 +0000 (22:31 +0100)]
Bug 13461 - Circ always asking for confirmation if RentalFeesCheckoutConfirmation is used
To test:
- Check RentalFeesCheckoutConfirmation is activated
- Try to check out an item without rental fine
- Verify confirmation message without explanation
is shown
- Apply patch
- Verify confirmation message is no longer shown
- Configure itemtype to have rental fee
- Veirfy now the confirmation message appears as
it should
Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 22b8d559f9c8f5733d051313c4d6266570d5be6f) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
David Cook [Tue, 16 Dec 2014 01:53:18 +0000 (12:53 +1100)]
Bug 13469 - Unapi path to XSLTs is wrong in OPAC
The Unapi path to XSLTs is wrong in the OPAC.
Unfortunately, it's coded to work just for Git installs, which makes it
tough to test.
_TEST PLAN_
Before applying:
1) Go to
http://GIT-INSTALL/cgi-bin/koha/unapi?id=koha:biblionumber:1&format=oai_dc
2) If the biblionumber exists, it should show you the record in OAI_DC format.
3) Go to
http://REGULAR-INSTALL/cgi-bin/koha/unapi?id=koha:biblionumber:1&format=oai_dc
4) You should get a software error
Apply the patch.
After applying:
1) Refresh the page for
http://yourgitinstall/cgi-bin/koha/unapi?id=koha:biblionumber:1&format=oai_dc
2) It should work exactly the same as before.
Thorough testers:
1) Push the code to that regular test install
2) Try the link again. It will properly show the converted record now.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Verified that single install
intrahtdocs==/usr/share/koha/clone1712/intranet/htdocs/intranet-tmpl plus
"/prog/en/xslt/" is the location for the required xslt files.
Script unapi in git install is still fine.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit f1323e60a290cfe100773d6877c54731e6a45050) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Bug 13470 - pay fines with extended borrower attributes result in application error
Test scenario:
1. ensure that extended patron attributes are turned on in system preferences
2. find borrower which has fine to pay, and click on pay button
3. verify application error
4. apply patch and verify that application error is gone
Signed-off-by: Aleisha <aleishaamohia@hotmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit cc06e22de7d54f013919d06b10608e5db92ee790) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Jonathan Druart [Wed, 10 Dec 2014 15:15:26 +0000 (16:15 +0100)]
Bug 13296: (follow-up) permit grep on AUTHUNIMARC
I would prefer not to hide this "stuff".
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit fab96202fd249939fd7d0e073f5f34b05663c547) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Fridolin Somers [Wed, 19 Nov 2014 10:56:54 +0000 (11:56 +0100)]
Bug 13296 - error when using z3950 with UNIMARC authorities
When using a z3950 connexion with UNIMARC authorities, you get an error :
Unsupported UNIMARC character encoding [ ] for XML output for UNIMARCAUTH; 100$a -> 20141119
I've seen thant Bug 2060 when adds authorities import adds a special behavior for UNIMARC : marc flavor must be UNIMARCAUTH instead of just UNIMARC.
This patch adds the same behavior when using z3950 connexion and import.
Test plan :
- Use a UNIMARC install
- Define a z3950 connexion for UNIMARC authorities
- Go to Authorities module
- Click on "New from Z39.50"
- Perform a search
=> Without patch : you get the error
=> With patch : you get results
- Import one result
=> You get the authoritie creation form with all datas
You may check same plan with MARC21 install
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
NOTE: depending on the target, the syntax in the configuration
might not be UNIMARC, but MARC21/USMARC instead!
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 9ccdbc49c715c6182e97e815eb46c6969926874f) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Jonathan Druart [Wed, 17 Dec 2014 09:43:34 +0000 (10:43 +0100)]
Bug 13465: Correct the field prefix ambiguity
This is introduced by Bug 12874.
Without this patch, it's not possible to clear (set to an empty string)
an item field.
This appended for field linked to an AV list but even if it's not.
The regex tried to prefix 'my_field' with 'items.' to have
'items.my_field'. It wanted to take care of the case where the prefix
already exists (Actually only 1: 'items.cn_source').
The regex is changed to: "add the prefix only if the string does not
contain a dot".
Moreover an ambiguity existed on the prefix: in marc_subfield_structure,
the kohafield is prefixed, but not in the key of the hash sent to
ModItemFromMarc.
Test plan:
- edit an item, set a status that is controlled by an authorized value
examples tested: damaged, not for loan
- check the status saved correctly
- edit the item again, reset the status to empty
- check the status saved correctly
- edit the item again, reset fields, edit fields
- check the fields saved correctly
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 2f266d94be06af73e72a807d9408136278e8fed4) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Kyle M Hall [Fri, 12 Dec 2014 14:04:57 +0000 (09:04 -0500)]
Bug 13449 - Syndetics TOC will not display in some cases
For reasons unknown, the table of contents data from Syndetics will not
display if there is no p element, even though within that if for the p
element there's a second one for the p element! This is neither good nor
necessary.
Test Plan:
1) Enable Syndetics
2) Find a record that should have a Syndetics TOC but doesn't
3) Apply this patch
4) Reload the page
5) Note the Syndetics TOC data now displays
Signed-off-by: Julius Fleschner <julius.fleschner@briarcliff.edu> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I couldn't test but from reading the code this should not
have any negative consequences.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 22d9db667281319afd9811f75c4e6a0ee298d334) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Sun, 30 Nov 2014 19:57:07 +0000 (20:57 +0100)]
Bug 12084: Format planned date in publication details on detail page
If items are created for a serial subscription, the issue
information is shown on the details page in staff with the
planned date in ().
To test:
1) Create a subscription with items added on receive
2) Receive a few issues and create items
3) Check the staff detail page
4) Verify that the published date shows under Publication details
in the items table, but that the date is not formatted
5) Apply patch
6) Verify the date is now formatted according to the DateFormat
system preference setting
Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit c5a8db10564f1dd1d8e87e9009df9c7918e2c1eb) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
1/ Add a new suggestion, put some values for the price
2/ View the suggestion in the staff interface
2/ Switch the currency format
3/ Notice the format of the price does not change
4/ Apply patch
5/ Notice now the syspref is respected
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, thx!
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit df2e9169b23ad3ecfbbf73367a19cb9117fb4ed4) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Tue, 2 Dec 2014 01:16:40 +0000 (14:16 +1300)]
Bug 13368 Holds priority messed up on checkout
To Test
1/ Create 3 (or more holds) on one biblionumber, make sure at least
one item is not on loan
2/ Check out the not on loan item to a borrower (maybe number 2 in the
queue)
3/ Look in the database (or on the holds tab on the moredetail.pl)
notice the priorities have not been reordered
4/ Apply patch and try again, notice now they have
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Confirmed the problem without the patch, and confirmed that the patch
corrects it.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit ef6bc21b2c4ebe04f6d22d081e447f6bb2955029) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
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>
projects / koha.git / log