[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-beta1-339-g02b97ec

Wed May 1 13:31:35 CEST 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  02b97ecdcf500043a97513a1a31d6720c471a731 (commit)
       via  10593eb8bcfe57567796ba72c9d19e0b69ce59d5 (commit)
       via  1ef0284759874164a21fb842aa27446422e7ecc7 (commit)
       via  c2db827e64b421fdf98a5d839e31276bf9d4674a (commit)
       via  cdf82c0070281c24ce337a503628cd6ebeff18ef (commit)
       via  c258a4f9b12bc2cde87880249902fcb319ca9afe (commit)
       via  7d96e1578c488d4f308d3d432ac579b5841a2cd5 (commit)
       via  9e52384ad9b5fd49b7481c0cea77c5e0ff777b94 (commit)
      from  3000869e566481277458a4e5ebb7cf8979fb13bb (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 02b97ecdcf500043a97513a1a31d6720c471a731
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Mon Apr 15 14:27:46 2013 +0200

    Bug 10053: borrowers.branchcode cannot be null

    The DB field borrowers.branchcode cannot be null (`branchcode`
    varchar(10) NOT NULL default ''). However, an empty value can be selected
    on creating/updating a patron.

    Test plan:
    - Add or edit a patron and choose the empty value for library
    (branchcode).
    - Save (pref BorrowerMandatoryField must not contain branchcode).
    - Mysql raises an error.
    - Apply the path.
    - Check that you are not able to select no library.

    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit 09d36cee3c16b14acf0435531d1789486e0a0a44)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit 10593eb8bcfe57567796ba72c9d19e0b69ce59d5
Author: David Cook <dcook at prosentient.com.au>
Date:   Tue Apr 23 12:58:19 2013 +1000

    Bug 10097 - Hide framework selection when importing staged authority records

    Currently, when importing authority records using the "Manage staged
    MARC records" tool, it will show the text "Add new bibliographic records
    into this framework:" followed by a drop-down menu of possible frameworks.

    Since these are bibliographic frameworks and we're importing authority
    records which do not use them, we have no need to show this information.

    I'm proposing just a little patch to display this info only for
    bibliographic records. From my tests, everything seems to work fine
    without this text and the drop-down, although I've only uploaded one
    MARC21 authority record at a time.

    --

    Test Plan:

    Before applying patch...

    1) Find yourself an authority record. I recommend downloading your
    favourite author from: http://authorities.loc.gov/
    2) Stage MARC for import. Choose "Authority" as your record type.
    3) Go to "Manage staged records"
    4) Underneath the button "Import this batch into the catalog", you
    should see the text "Add new bibliographic records into this framework:"
    followed by a drop-down of the available frameworks.

    Optionally) You can also try this for bibliographic records. You'll find
    the same.

    After applying the patch...

    5) Repeat steps 2 and 3.
    6) Underneath the button "Import this batch into the catalog", you
    should just see a table listing your MARC record(s).
    7) Stage MARC for import. Choose "Bibliographic" as your record type.
    8) Go to "Manage staged records".
    9) You should find step 4 still to be true (i.e. the "Add new
    bibliographic..." text should still be there).

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Small template change, passes all tests.
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit 01f7542f4bdbd9b31836ed8c3fc817b67086b8d2)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit 1ef0284759874164a21fb842aa27446422e7ecc7
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Feb 27 08:46:56 2013 -0500

    Bug 9719 - Changing the rows per page on a custom report fails if it has user supplied parameters

    If you create an SQL report that includes one or more parameters,
    using the 'rows per page' pulldown does not work. Instead, it will
    prompt for the parameters again and shows the first page of output.

    Test Plan:
    1) Create a new report from sql as follows:
        SELECT * FROM borrowers WHERE surname LIKE <<Last Name>> AND firstname LIKE <<First Name>>
    2) Run this report
    3) Change the 'Rows per page' and click 'Update'
    4) This should kick you back to the start where the report asks you for your parameters
    5) Apply the patch
    6) Repeat step 3, this time is should work correctly

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works nicely now. All tests and QA script pass.
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit 020b8a66bc1ea9173ede154678ff690fd5f67c1f)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit c2db827e64b421fdf98a5d839e31276bf9d4674a
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Apr 30 14:39:48 2013 -0400

    Bug 9957 - Missing cancel link on subfield editing page

    The subfield edit page has an edit bottom at the top of the page. Almost
    no other edit screens do this. It would be more consistent to put it at
    the bottom. Also missing is a "cancel" link. This patch fixes both
    issues.

    The patch also adds "Default" to the breadcrumbs when editing a subfield
    in the default framework.

    To test, apply the patch and edit a subfield: MARC frameworks -> MARC
    structure -> Subfields -> Edit. The "Save changes" button should appear
    at the bottom of the page alonside a "Cancel" link. Both should work
    correctly.

    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Template change only, improves consistency and works
    nicely.
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit 559ff89fd641df9a67fe6fc53efdc49854ccdd1c)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit cdf82c0070281c24ce337a503628cd6ebeff18ef
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Apr 26 14:20:49 2013 -0400

    Bug 9266 - Untranslated strings in tags moderation

    There are a couple of English strings in tags moderation JavaScript
    which are not properly enclosed in the _() function enabling
    translation. As a result, clicking a translated 'Approve' or
    'Reject' button in the table of tags would change the button's
    neighbor's label to the English string. This patch
    corrects it.

    To test, apply the patch and regenerate a translation to test with. Go
    to Tools -> Tags and find a list of tags to moderate (pending, approved,
    or rejected). When you click on an 'Approve' or 'Reject' tag in the
    table of tags, the buttons in each Approve/Reject pair should retain
    their correct translated label. For instance, looking at approved tags
    in French:

    [ Approuvé ] [ Rejeter ]

    Clicking the "Rejetee" button should change the state to:

    [ Approuver ] [ Rejetée ]

    Clicking "Approuver" should return the buttons to the first state.

    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Mason James <mtj at kohaaloha.com>
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit acfbfcb7d9b6bef3186adc9b93ead44fc58ce420)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit c258a4f9b12bc2cde87880249902fcb319ca9afe
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Wed May 1 07:14:44 2013 -0400

    Bug 7143: Add missing contributor to about page
    (cherry picked from commit 78d32cc138fda7f9872bceab36fe37d5bf39ee61)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit 7d96e1578c488d4f308d3d432ac579b5841a2cd5
Author: D Ruth Bavousett <druthb at gmail.com>
Date:   Tue Jan 22 15:44:33 2013 -0300

    Bug 7143: Updating the About page with translation teams for Basque and Turkish

    Text-change only, should require little QA and testing.
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Template change only, changes look correct to me.
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit 80d926ea60baa0046bd11ae92346ef3f23ed41e3)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit 9e52384ad9b5fd49b7481c0cea77c5e0ff777b94
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Apr 29 16:02:29 2013 +0200

    Bug 7143 Followup for some new developers on about page

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Template change only - changes look correct to me.
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit c641fd0b957e02e42b0ae389fa5e5b6ca114705b)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |   24 +++++++++++++++++--
 .../en/modules/admin/marc_subfields_structure.tt   |    8 ++++--
 .../prog/en/modules/members/memberentrygen.tt      |    1 -
 .../en/modules/reports/guided_reports_start.tt     |    6 ++++-
 .../intranet-tmpl/prog/en/modules/tags/review.tt   |    4 +-
 .../prog/en/modules/tools/manage-marc-import.tt    |    2 +
 reports/guided_reports.pl                          |    1 +
 7 files changed, 36 insertions(+), 10 deletions(-)

hooks/post-receive
-- 
main Koha release repository