[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.07-15-g9fd59ed

Tue Dec 3 16:30:39 CET 2013

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.12.x has been updated
       via  9fd59ed985b0fac6dfff3fddaad8bf247579587c (commit)
       via  b6330d75c1e6937e09435a4e8accb1af2fa1cc6b (commit)
       via  609dd4ba45dd15f93e41a8a1300548a5059a87b0 (commit)
       via  82eb608a9516a20bbb21ad5da6dd9303c0aafcba (commit)
       via  b36aeb172d1cd5aa582042d46993e9b7d188e129 (commit)
       via  b6c4381e3e9b98d30afef209abc3d87eeaea295a (commit)
       via  a6b83b24ca090f2be724706daa4768f659ef1eb8 (commit)
       via  7f21891e10647d95449d265501a60a7915d778b6 (commit)
       via  ac2a256933349a52d064572be4268648a1902d95 (commit)
       via  d7eea46ade06ab22634526ec0909f7f3c036b9f7 (commit)
      from  cccca7ca2e8dda5e247ac2b3a87797d8469f9ab4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9fd59ed985b0fac6dfff3fddaad8bf247579587c
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Sep 11 11:51:54 2013 -0400

    Bug 10850 - give quick spine label template page its own ID

    Out of three conditional cases for display of the <body> tag one lacked
    a unique ID. This patch copies the unique ID from the other cases to the
    one lacking.

    This patch also corrects the case of an "onload" attribute which should
    follow XHTML style rules.

    To test, the patch for Bug 9618 must be applied. Set the
    SpineLabelAutoPrint system preference to "[don't] automatically pop up a
    print dialog." Submit a barcode on the quick spine label creator and
    view source. The <body> tag should have an ID attribute.

    Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 5fe524cf3ab0ff78401e7b467823da4d62d9a537)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit b6330d75c1e6937e09435a4e8accb1af2fa1cc6b
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Fri Oct 18 04:47:12 2013 +0000

    Bug 10038: (follow-up) fix tabs

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit ce9f504c7903d7431c8e18754f18ddf5bca2727a)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 609dd4ba45dd15f93e41a8a1300548a5059a87b0
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Jul 17 15:02:43 2013 +0200

    Bug 10038: fix doubled 'default' entry when creating a new authority type

    Test plan:
    - Create a new authority type
    - Click MARC structure
    - Verify the pull down has only 1 entry for Default
    - Go on the authority type home (admin/authtypes.pl)
    - Click on the "MARC structure" link for the default type
    - Verify the pull down has only 1 entry for Default

    This patch adds a sort (on the authtypecode) for these 2 lists.

    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Comment: Works as described. No koha-qa errors.

    When creating a new framework it would be better to have Default
    on top, but one is way better than two :)

    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Agreed, one is better than two :)
    All tests and QA script pass.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit b04118df82a20eeec71bfb99349ab28943011c42)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 82eb608a9516a20bbb21ad5da6dd9303c0aafcba
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Thu Oct 17 23:05:15 2013 +0000

    Bug 10535: (follow-up) wrap Budgets.t in transaction

    This patch also temporarily removes any existing
    budgets to avoid issues where tests can fail if there
    is already an active budget in the database.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 969669bb1e2cb08bbfc91334b6c52e3dd0413e11)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit b36aeb172d1cd5aa582042d46993e9b7d188e129
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Thu Jul 11 16:51:40 2013 +0000

    Bug 10535: (follow-up) add test case

    This adds a test case for the new default sort
    order for GetBudgets().

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 5a384cc64367647aa519c196ae8927d309b1ec19)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit b6c4381e3e9b98d30afef209abc3d87eeaea295a
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Sep 23 23:18:34 2013 +0200

    Bug 10935: (follow-up) adding a line break to fix first list item

    Without the line break after the include the first entry
    of our list of orders was behind the header row in the first row
    of the spreadsheet.

    Adding the line break seems to fix that and translated CSV can
    be exported correctly now.

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit b1e4db6be9bbb18c07c16f0eb2ad02867cf938de)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit a6b83b24ca090f2be724706daa4768f659ef1eb8
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Mon Sep 23 17:07:09 2013 +0200

    Bug 10935: fix breakage of CSV acq exports when using a non-English translation

    To reproduce:
    - cd misc/translator
    - ./translate update LANG
    - ./translate install LANG
    - go to the Koha mainpage and change the language.
    - go to acqui/basketgroup.pl?booksellerid=XX and try to export a
      basketgroup.
    The headers is followed by the first basketgroup information. There is
    no carriage return.

    It looks like it is caused by a routine used by the translator script
    (TmplTokenizer::string_canon).

    To test this patch:
    - apply it
    - cd misc/translator
    - ./translate -f update LANG
    - translate headers in your po file
    - ./translate -f install LANG
    - go to acqui/basketgroup.pl?booksellerid=XX and try to export a
      basketgroup.
    - verify that the csv looks good now.
    - same thing for basket.

    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Good idea and seems to work - just fixing a small glitch
    with the first entry of the list in a follow-up.

    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 6bf848303fd4a0d827cc688dab907166df701102)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 7f21891e10647d95449d265501a60a7915d778b6
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Sep 13 16:28:39 2013 +0200

    Bug 10884: circulation table: fix odd behavior on checkboxes

    Test plan:
    Play with renew, check in and export checkboxes.
    The expected behavior is: the renew and check in cb should work as radio
    button, without affecting the export cb.

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Template changes only.
    Amended test plan:
    * Create a CSV profile under Tools > CSV profiles
    * Add CSV profile to system preference ExportWithCsvProfile

    1) Check export checkbox
    2) Check check in for same item
    3) Switch to Renew

    The export checkbox should not get unchecked when switching
    between renew and check in.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit fa3903fe3d4955e2fd36613a7d7ac7f3a363913a)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit ac2a256933349a52d064572be4268648a1902d95
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Sep 13 15:55:23 2013 +0200

    Bug 9294: Followup : add missing lines.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit da9863f1a5225d3af7daac1e4874e42fbd7dd369)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit d7eea46ade06ab22634526ec0909f7f3c036b9f7
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Aug 15 16:14:50 2013 -0400

    Bug 9294 - Move JavaScript out of circulation template

    This patch creates a new js file, js/pages/circulation.js, and begins
    the process of moving JavaScript into it from circulation.tt. I have
    started the process by focusing on sections which are least dependent on
    template variables.

    To test, load a patron for checkout who has something checked out.
    There should be no JavaScript errors:
     - Tabs should work.
     - Showing and hiding the "Add message" form should work.
     - The "specify due date" datepicker should work.
     - Controls for selecting checkboxes in the checkouts table should work

    Signed-off-by: Campbell Reid-Tait <campbellreidtait at gmail.com>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Just found a weird behavior with checkboxes in the checkouts table, but
    still exists on master.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 249b37ef488d90d8cd9104c4d3d806f7a30590d8)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 admin/auth_tag_structure.pl                        |  275 ++++++++++----------
 .../prog/en/includes/csv_headers/acqui/basket.tt   |    1 +
 .../en/includes/csv_headers/acqui/basketgroup.tt   |    1 +
 .../intranet-tmpl/prog/en/js/pages/circulation.js  |  134 ++++++++++
 .../prog/en/modules/acqui/csv/basket.tt            |    2 +-
 .../prog/en/modules/acqui/csv/basketgroup.tt       |    2 +-
 .../prog/en/modules/admin/auth_tag_structure.tt    |    8 +-
 .../prog/en/modules/circ/circulation.tt            |  153 +----------
 .../prog/en/modules/labels/spinelabel-print.tt     |    4 +-
 t/db_dependent/Budgets.t                           |   26 +-
 10 files changed, 315 insertions(+), 291 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basket.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/js/pages/circulation.js

hooks/post-receive
-- 
main Koha release repository