koha:3.20.x

Last commit made on 2015-08-23
Get this branch:
git clone -b 3.20.x https://git.launchpad.net/koha
Members of Koha Release Team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
3.20.x
Repository:
lp:koha

Recent commits

5310bad... by Galen Charlton on 2015-08-04

Bug 14644: unbreak SIP2 terminal login when using telnet transport

This patch fixes breakage introduced by the patch for bug 13506
that prevented SIP2 clients from authenticating themselves over
the telnet transport. Attempts to do so would manifest by the
SIPServer backend crashing and the connection getting closed.

To test:

[1] Use the stock SIPServer config, etc/SIPconfig.xml, and ensure
    that the database contains a staff user whose username is 'term1'
    and password is 'term1' that has the circulate permission.
[2] Start SIPServer, telnet to port 8023, and attempt to log in. The
    connection will be aborted:

    $ telnet localhost 8023
    Trying 127.0.0.1...
    Connected to localhost.
    Escape character is '^]'.
    login: term1
    password: term1
    Connection closed by foreign host.

[3] Apply the patch and restart SIPSever, then repeat step 2. This time,
    the login should succeed:

    $ telnet localhost 8023
    Trying 127.0.0.1...
    Connected to localhost.
    Escape character is '^]'.
    login: term1
    password: term1
    Login OK. Initiating SIP

Signed-off-by: Galen Charlton <email address hidden>
Signed-off-by: Colin Campbell <email address hidden>

Signed-off-by: Jonathan Druart <email address hidden>
Signed-off-by: Tomas Cohen Arazi <email address hidden>
(cherry picked from commit 3ec8b27185f0c8600bc931c5284a5d73d0a42aac)
Signed-off-by: Chris Cormack <email address hidden>

9c98d16... by Jonathan Druart <email address hidden> on 2015-07-14

Bug 14517: List shelves list is broken for translated interfaces

The translation script adds quotes ("") around translated string (Edit
for instance).
Which breaks the json structure.

Example:
"dt_action": "<a style=\"cursor:pointer\"><form action='shelves.pl'
method='get'><input class="editshelf" value="Editar" type="submit"
/></form></a>"

Test plan:
1/ On the staff interface create a private list
2/ Go to More > Lists ('Your lists' tab)
3/ Translate the templates to any language like:
  $ cd misc/translator/
  $ perl translate install es-ES
4/ Enable the translated templates on the sysprefs
5/ Switch to the translated language
6/ Go to the lists page (Mas > Listas in es-ES)
The list should be displayed correctly.

Note: There is a limitation. If a translated string contains a simple
quote ('), it will also break the json.

Signed-off-by: Chris Cormack <email address hidden>

Signed-off-by: Kyle M Hall <email address hidden>
Signed-off-by: Tomas Cohen Arazi <email address hidden>
(cherry picked from commit 75c70d42a5df526c8bed8633d65721696a0fa176)
Signed-off-by: Chris Cormack <email address hidden>

c0f40ce... by Tamil on 2015-07-23

Bug 14592: Export data bad encoding

Tools > Export data produces a file badly encoded, when marc/xml file
format is chosen. It works with CSV.

To test:

1. Tools > Export data
2. Choose a limited interval of biblionumber
3. Export in marc/xml/csv.
4. Check files exported at 3: csv file is ok. marc/xml files are
   corrupted, ie badly encoded.
5. Apply the patch
6. Repeat steps 3&4, and confirm that all file formats are valid.

Signed-off-by: Tomas Cohen Arazi <email address hidden>

Signed-off-by: Katrin Fischer <email address hidden>
Signed-off-by: Tomas Cohen Arazi <email address hidden>
(cherry picked from commit dfe07fa410eb48241c218abcc156c466576dcc9a)
Signed-off-by: Chris Cormack <email address hidden>

d14d01d... by Ulrich Kleiber <email address hidden> on 2015-07-15

Bug 14534: Stop overdue_notices.pl from issuing the warning: Use of uninitialized value $borrowernumber

Signed-off-by: Chris Cormack <email address hidden>

To test:

1/ Run the overdue_notices.pl script (don't do this on production
obviously :))
2/ Notice the warns
3/ Apply patch
4/ Run again
5/ Notice no warns, but notices are still generated ok

Signed-off-by: Jonathan Druart <email address hidden>
Signed-off-by: Tomas Cohen Arazi <email address hidden>
(cherry picked from commit d873ed3b5d97f825c52dc53c2f72bd5a1ef03647)
Signed-off-by: Chris Cormack <email address hidden>

d26146a... by Indranil Das Gupta on 2015-06-14

Bug 13663: (followup) fixes tab char QA test fails

Fixes the tab char qa test suite fails in the following files:

1/ tools/upload-file-progress.pl
2/ tools/upload-file.pl

Signed-off-by: Jonathan Druart <email address hidden>
Amended patch: tidy whitespaces
Signed-off-by: Tomas Cohen Arazi <email address hidden>

(cherry picked from commit fb17640c032f0ba0d6594076a71b8b37fda8b373)
Signed-off-by: Chris Cormack <email address hidden>

178d1ec... by Alex Arnaud <email address hidden> on 2015-06-11

Bug 13663: Fix permissions in upload-file.pl and upload-file-progress.pl

Test plan:
Verify that the circulate_remaining_permissions perm is enough to upload
.koc file.

Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <email address hidden>

Signed-off-by: Jonathan Druart <email address hidden>
Signed-off-by: Tomas Cohen Arazi <email address hidden>
(cherry picked from commit 2fcc02321f0f56760cfdbd67a29917e4f0ba278b)
Signed-off-by: Chris Cormack <email address hidden>

4e0440c... by hecax on 2015-07-16

Bug 14548: Typo in help file for 3.20 (batch_record_modification.tt)

Typo found in batch_record_modification.tt file for Koha help in 3.20

Test plan:
1) Go to url 'koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/batch_record_modification.tt:20' and check the typo "critera" or go to Tools › Batch record modification, open up the help
2) Apply the patch
3) Repeat step 1 and check if the typo is fixed.

Sponsored-by: Universidad de El Salvador
Signed-off-by: Aleisha <email address hidden>
Signed-off-by: Katrin Fischer <email address hidden>
Signed-off-by: Tomas Cohen Arazi <email address hidden>
(cherry picked from commit 605638243aa6d3db8784f54a4687a850646f6f54)
Signed-off-by: Chris Cormack <email address hidden>

cea4c53... by hecax on 2015-07-16

Bug 14547: Typo in help file for 3.20 (basket.tt)

Typo found in basket.tt file for Koha help in 3.20

Test plan:
1) Go to url 'koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt:24' and check the typo "susbscription" or go to Acqusitions > create or view an existing basket, open up the help
2) Apply the patch
3) Repeat step 1 and check if the typo is fixed.

Sponsored-by: Universidad de El Salvador
Signed-off-by: Aleisha <email address hidden>

Signed-off-by: Katrin Fischer <email address hidden>
Signed-off-by: Tomas Cohen Arazi <email address hidden>
(cherry picked from commit b7e40ce3fba6a6bcfbb6694bf5875a315b3f6e53)
Signed-off-by: Chris Cormack <email address hidden>

7fe64b0... by Stéphane Delaune <email address hidden> on 2015-07-23

Bug 10961: (followup) Make query fields explicit and add regression tests

add correct frameworkcode to _koha_marc_update_bib_ids parameters

add test, prove with : prove t/db_dependent/Biblio.t

TEST PLAN
---------
1) git checkout -b bug_10961 origin/master
2) git bz apply 10961
3) git checkout origin/master -- C4/Biblio.pm
4) prove t/db_dependent/Biblio.t
   -- was expecting failure, got failure.
5) git reset --hard origin/master
6) git bz apply 10961
7) prove t/db_dependent/Biblio.t
   -- success as expected.
8) Read over code.
   -- Noted it also grabs the framework code for the biblio, rather than uses default.
      And it also corrects an indentation issue.
      Test case looks like it attempts to cover the biblionumber!=biblioitemnumber case
      by adding 1.
9) run koha qa test tools.

Signed-off-by: Mark Tompsett <email address hidden>
Signed-off-by: Tomas Cohen Arazi <email address hidden>
(cherry picked from commit 62dc6b0ca15a9de99a1cb41809e6c9c016e6b0d0)
Signed-off-by: Chris Cormack <email address hidden>

d0b989a... by Kyle M Hall <email address hidden> on 2013-09-27

Bug 10961: Error in GetMarcBiblio can cause severe data loss

A bug in GetMarcBiblio can cause severe data loss if your database has
records where the biblionumber and biblioitemnumber do not match and the
script misc/batchRebuildBiblioTables.pl is run.

The Biblio::GetMarcBiblio makes a kall to
C4::Biblio::_koha_marc_update_bib_ids which passes the biblionumber as
both the biblionumber *and the biblioitemnumber*.

Thus, if your biblio and biblioitem numbers are not always equal, you
will end up with a record where the biblioitemnumber is incorrect in the
record!

This is usually not a severe issue, but since batchRebuildBiblioTables
uses that record to update the database tables, it ends up updating the
wrong biblioitem row!

NOTE: What a horrible, horrible typo that was. Tested this with the
      second patch.

Signed-off-by: Mark Tompsett <email address hidden>
Signed-off-by: Tomas Cohen Arazi <email address hidden>
(cherry picked from commit 298c4c76a5f231d9cc0935b6f14a5f191b727804)
Signed-off-by: Chris Cormack <email address hidden>